stardis-solver

commit f3d63291630e3b87389dd545a5d52f829312fe6b
parent d3af7d0470dd13e6845af0ac9051cf78d158b358
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date:   Thu,  7 Nov 2019 12:08:23 +0100

Use star-enclosures[2D] 0.4.2

Diffstat:
M
cmake/CMakeLists.txt
 | 
4
++--
M
src/sdis_scene_Xd.h
 | 
11
++++++-----

2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -32,8 +32,8 @@ find_package(RCMake 0.4 REQUIRED)
 find_package(Star2D 0.3.1 REQUIRED)
 find_package(Star3D 0.6 REQUIRED)
 find_package(StarSP 0.8 REQUIRED)
-find_package(StarEnc 0.2.2 REQUIRED)
-find_package(StarEnc2D 0.2.2 REQUIRED)
+find_package(StarEnc 0.4.2 REQUIRED)
+find_package(StarEnc2D 0.4.2 REQUIRED)
 find_package(RSys 0.8.1 REQUIRED)
 find_package(OpenMP 2.0 REQUIRED)
 
diff --git a/src/sdis_scene_Xd.h b/src/sdis_scene_Xd.h
@@ -570,8 +570,8 @@ XD(run_analyze)
   geom.position = position;
   geom.data = ctx;
   res = sencXd(scene_add_geometry)
-    (senc_scn, (unsigned)nprims, XD(geometry_indices), geometry_media, NULL,
-     (unsigned)nverts, XD(geometry_position), &geom);
+    (senc_scn, (unsigned)nprims, XD(geometry_indices), geometry_media,
+     (unsigned)nverts, XD(geometry_position), NULL, NULL, &geom);
   if(res != RES_OK) goto error;
 
   /* Launch the scene analyze */
@@ -624,7 +624,7 @@ XD(setup_properties)
     size_t ninterfaces;
 
 #if DIM == 2
-    /* Retrieve the triangle id in user space */
+    /* Retrieve the segment id in user space */
     SENCXD(descriptor_get_global_segment_global_id(desc, iprim, &iprim_adjusted));
     /* Fetch the enclosures that the segment splits */
     SENCXD(descriptor_get_global_segment_enclosures(desc, iprim, enclosures));
@@ -835,12 +835,13 @@ XD(setup_enclosure_geometry)(struct sdis_scene* scn, struct sencXd(enclosure)* e
   res = darray_uint_resize(&enc_data->local2global, nprims);
   if(res != RES_OK) goto error;
   FOR_EACH(iprim, 0, nprims) {
+    enum sencXd(side) side;
 #if DIM == 2
     senc2d_enclosure_get_segment_global_id
-      (enc, iprim, darray_uint_data_get(&enc_data->local2global)+iprim);
+      (enc, iprim, darray_uint_data_get(&enc_data->local2global)+iprim, &side);
 #else
     senc_enclosure_get_triangle_global_id
-      (enc, iprim, darray_uint_data_get(&enc_data->local2global)+iprim);
+      (enc, iprim, darray_uint_data_get(&enc_data->local2global)+iprim, &side);
 #endif
   }