solstice-solver

commit 1f1b6e7522b0d50e91ce2ab0d5b1cd00e8b70940
parent 55800a0a35915ba325d91bc8f87b97af61b154a4
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Sat, 16 Sep 2017 16:46:58 +0200

Merge branch 'release_0.4.1'

Diffstat:
M
README.md
 | 
5
+++++
M
cmake/CMakeLists.txt
 | 
2
+-
M
src/ssol_solver.c
 | 
7
++++++-

3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
@@ -26,6 +26,11 @@ variable the install directories of its dependencies.
 
 ## Release notes
 
+### Version 0.4.1
+
+- Fix a wrong "path inconsistency" check. The paths going from a dielectric to
+  infinity were wrongly detected as inconsistent.
+
 ### Version 0.4
 
 - Add the `SSOL_PATH_ERROR` type used for the paths that travel unforeseen
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -51,7 +51,7 @@ rcmake_append_runtime_dirs(_runtime_dirs RSys Star3D Star3DUT StarCPR StarSF Sta
 ################################################################################
 set(VERSION_MAJOR 0)
 set(VERSION_MINOR 4)
-set(VERSION_PATCH 0)
+set(VERSION_PATCH 1)
 set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 
 set(SSOL_FILES_SRC
diff --git a/src/ssol_solver.c b/src/ssol_solver.c
@@ -891,7 +891,12 @@ trace_radiative_path
           if (res != RES_OK) goto error;
         }
         last_segment = 1; /* Path reached its last segment */
-        if(!in_atm) {
+
+        /* Check medium consistency. Note that one has to check `out_medium' -
+         * and not `in_medium' - against the atmosphere since it is actually
+         * the medium in which the ray was traced; at this step, `in_medium' is
+         * still the medium of the previous path segment. */
+        if(!media_ceq(&out_medium, &scn->air)) {
           log_error(scn->dev, "Inconsistent medium description.\n");
           res = RES_BAD_OP;
           goto error;