htsky

commit b847dbc96a2372503b73f482a5e210474676762f
parent f7c17439b8e84039c438ff4617c9be9ebd95175c
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Tue,  2 Feb 2021 08:52:25 +0100

Upd voxel getters profile

Change function signatures with respect to the updates of the Star-VoXel
API.

Diffstat:
M
cmake/CMakeLists.txt
 | 
2
+-
M
src/htsky_atmosphere.c
 | 
7
++++++-
M
src/htsky_cloud.c
 | 
7
++++++-

3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -27,7 +27,7 @@ find_package(HTMIE 0.0.2 REQUIRED)
 find_package(OpenMP 1.2 REQUIRED)
 find_package(RCMake 0.3 REQUIRED)
 find_package(RSys 0.7 REQUIRED)
-find_package(StarVX 0.1 REQUIRED)
+find_package(StarVX 0.2 REQUIRED)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${RCMAKE_SOURCE_DIR})
 include(rcmake)
diff --git a/src/htsky_atmosphere.c b/src/htsky_atmosphere.c
@@ -30,7 +30,11 @@
  * Helper functions
  ******************************************************************************/
 static void
-atmosphere_vox_get(const size_t xyz[3], void* dst, void* context)
+atmosphere_vox_get
+  (const size_t xyz[3],
+   const uint64_t mcode,
+   void* dst,
+   void* context)
 {
   float* vox = dst;
   struct build_tree_context* ctx = context;
@@ -42,6 +46,7 @@ atmosphere_vox_get(const size_t xyz[3], void* dst, void* context)
   double ka_max, ks_max, kext_max;
   size_t ilayer;
   ASSERT(xyz && dst && context);
+  (void)mcode;
 
   /* Compute the boundaries of the SVX voxel */
   HTGOP(get_level(ctx->sky->htgop, 0, &level));
diff --git a/src/htsky_cloud.c b/src/htsky_cloud.c
@@ -595,10 +595,15 @@ cloud_vox_get_gas
 }
 
 static void
-cloud_vox_get(const size_t xyz[3], void* dst, void* context)
+cloud_vox_get
+  (const size_t xyz[3],
+   const uint64_t mcode,
+   void* dst,
+   void* context)
 {
   struct build_tree_context* ctx = context;
   ASSERT(context);
+  (void)mcode;
   cloud_vox_get_particle(xyz, dst, ctx);
   cloud_vox_get_gas(xyz, dst, ctx);
 }