stardis-solver

commit 1db75a944fe9f179903ff7c51b3fde60367604fa
parent f0d639b37faf5a5a6233112126e99945dfc0bf46
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Tue, 22 Jan 2019 12:28:00 +0100

Merge branch 'release_0.6.1'

Diffstat:
M
README.md
 | 
7
+++++++
M
cmake/CMakeLists.txt
 | 
10
+++++-----
M
src/sdis_scene_Xd.h
 | 
39
+++++++++++++++++++++++++--------------

3 files changed, 37 insertions(+), 19 deletions(-)
diff --git a/README.md b/README.md
@@ -25,6 +25,13 @@ variable the install directories of its dependencies.
 
 ## Release notes
 
+### Version 0.6.1
+
+- Bump version of the Star-Enclosures[2D] dependencies: the new versions fix
+  issues in the construction of fluid enclosures.
+- Bump version of the Star-<2D|3D> dependencies: the new versions rely on Embree3
+  rather than on Embree2 for their ray-tracing back-end.
+
 ### Version 0.6
 
 - Add the `sdis_solve_boundary` function: it computes the average temperature
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -29,11 +29,11 @@ CMAKE_DEPENDENT_OPTION(ALL_TESTS
 # Check dependencies
 ################################################################################
 find_package(RCMake 0.4 REQUIRED)
-find_package(Star2D 0.2 REQUIRED)
-find_package(Star3D 0.5 REQUIRED)
+find_package(Star2D 0.3 REQUIRED)
+find_package(Star3D 0.6 REQUIRED)
 find_package(StarSP 0.8 REQUIRED)
-find_package(StarEnc 0.2.0 REQUIRED)
-find_package(StarEnc2D 0.2.0 REQUIRED)
+find_package(StarEnc 0.2.2 REQUIRED)
+find_package(StarEnc2D 0.2.2 REQUIRED)
 find_package(RSys 0.6.1 REQUIRED)
 find_package(OpenMP 2.0 REQUIRED)
 
@@ -48,7 +48,7 @@ rcmake_append_runtime_dirs(_runtime_dirs RSys Star3D StarSP StarEnc StarEnc2D)
 ################################################################################
 set(VERSION_MAJOR 0)
 set(VERSION_MINOR 6)
-set(VERSION_PATCH 0)
+set(VERSION_PATCH 1)
 set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 
 set(SDIS_FILES_SRC
diff --git a/src/sdis_scene_Xd.h b/src/sdis_scene_Xd.h
@@ -660,26 +660,37 @@ XD(setup_enclosures)(struct sdis_scene* scn, struct sencXd(descriptor)* desc)
 #ifndef NDEBUG
       /* Dump the problematic enclosure. */
       unsigned i;
+#if DIM == 2
+#define VEC_STR "%g %g"
+#define VEC_SPLIT SPLIT2
+#define UVEC_STR "%u %u"
+#define UVEC_SPLIT(A) 1 + (A)[0], 1 + (A)[1]
+#define PRIM_COUNT segment_count
+#define GET_PRIM senc2d_enclosure_get_segment
+#else
+#define VEC_STR "%g %g %g"
+#define VEC_SPLIT SPLIT3
+#define UVEC_STR "%u %u %u"
+#define UVEC_SPLIT(A) 1 + (A)[0], 1 + (A)[1], 1 + (A)[2]
+#define PRIM_COUNT triangle_count
+#define GET_PRIM senc_enclosure_get_triangle
+#endif
       FOR_EACH(i, 0, header.vertices_count) {
         double tmp[3];
         SENCXD(enclosure_get_vertex(enc, i, tmp));
-        printf("v %g %g %g\n", SPLIT3(tmp));
+        log_warn(scn->dev, "v "VEC_STR"\n", VEC_SPLIT(tmp));
       }
-#if DIM == 2
-      FOR_EACH(i, 0, header.segment_count) {
-        unsigned indices[2];
-        SENCXD(enclosure_get_segment(enc, i, indices));
-        printf("f %lu %lu\n", (unsigned long)(1 + indices[0]),
-          (unsigned long)(1 + indices[1]));
-      }
-#else
-      FOR_EACH(i, 0, header.triangle_count) {
+      FOR_EACH(i, 0, header.PRIM_COUNT) {
         unsigned indices[3];
-        SENCXD(enclosure_get_triangle(enc, i, indices));
-        printf("f %lu %lu %lu\n", (unsigned long) (1 + indices[0]),
-          (unsigned long) (1 + indices[1]), (unsigned long) (1 + indices[2]));
+        ASSERT(GET_PRIM(enc, i, indices) == RES_OK);
+        log_warn(scn->dev, "f "UVEC_STR"\n", UVEC_SPLIT(indices));
       }
-#endif
+#undef VEC_STR
+#undef VEC_SPLIT
+#undef UVEC_STR
+#undef UVEC_SPLIT
+#undef PRIM_COUNT
+#undef GET_PRIM
 #endif
       res = RES_BAD_ARG;
       goto error;