htrdr

commit ccc8ee43030fb23c16965144e9790269551f6790
parent d5953ed7951c4ae659c7176446f92e7be3f462bc
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Wed, 13 Oct 2021 18:50:12 +0200

Handle API break introduced by Star-SamPling 0.12

Diffstat:
M
cmake/atmosphere/CMakeLists.txt
 | 
2
+-
M
cmake/combustion/CMakeLists.txt
 | 
2
+-
M
cmake/core/CMakeLists.txt
 | 
2
+-
M
src/core/htrdr_draw_map.c
 | 
4
++--

4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/cmake/atmosphere/CMakeLists.txt b/cmake/atmosphere/CMakeLists.txt
@@ -27,7 +27,7 @@ find_package(RSys 0.11 REQUIRED)
 find_package(Star3D 0.8 REQUIRED)
 find_package(StarCamera 0.0 REQUIRED)
 find_package(StarSF 0.6 REQUIRED)
-find_package(StarSP 0.10 REQUIRED)
+find_package(StarSP 0.12 REQUIRED)
 find_package(StarVX 0.1 REQUIRED)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${RCMAKE_SOURCE_DIR})
diff --git a/cmake/combustion/CMakeLists.txt b/cmake/combustion/CMakeLists.txt
@@ -27,7 +27,7 @@ find_package(RSys 0.11 REQUIRED)
 find_package(Star3D 0.8 REQUIRED)
 find_package(StarCamera 0.0 REQUIRED)
 find_package(StarSF 0.6 REQUIRED)
-find_package(StarSP 0.10 REQUIRED)
+find_package(StarSP 0.12 REQUIRED)
 find_package(StarVX 0.1 REQUIRED)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${RCMAKE_SOURCE_DIR})
diff --git a/cmake/core/CMakeLists.txt b/cmake/core/CMakeLists.txt
@@ -28,7 +28,7 @@ find_package(RSys 0.11 REQUIRED)
 find_package(Star3D 0.8 REQUIRED)
 find_package(StarCamera 0.0 REQUIRED)
 find_package(StarSF 0.6 REQUIRED)
-find_package(StarSP 0.10 REQUIRED)
+find_package(StarSP 0.12 REQUIRED)
 find_package(OpenMP 1.2 REQUIRED)
 find_package(MPI 2 REQUIRED)
 
diff --git a/src/core/htrdr_draw_map.c b/src/core/htrdr_draw_map.c
@@ -554,7 +554,7 @@ draw_map
   ASSERT(pix_sz && pix_sz[0] > 0 && pix_sz[1] > 0);
   (void)ntiles_x, (void)ntiles_y;
 
-  res = ssp_rng_create(htrdr->allocator, &ssp_rng_mt19937_64, &rng_proc);
+  res = ssp_rng_create(htrdr->allocator, SSP_RNG_MT19937_64, &rng_proc);
   if(res != RES_OK) {
     htrdr_log_err(htrdr, "Could not create the RNG used to sample a process "
       "to steal -- %s.\n", res_to_cstr((res_T)res));
@@ -636,7 +636,7 @@ draw_map
      * current thread only and thus it has to manage only one RNG. This proxy
      * is initialised in order to ensure that an unique and predictable set of
      * random numbers is used for the current tile. */
-    proxy_create2_args.type = &ssp_rng_threefry;
+    proxy_create2_args.type = SSP_RNG_THREEFRY;
     proxy_create2_args.sequence_offset = RNG_SEQUENCE_SIZE * (size_t)mcode;
     proxy_create2_args.sequence_size = RNG_SEQUENCE_SIZE;
     proxy_create2_args.sequence_pitch = RNG_SEQUENCE_SIZE * (size_t)ntiles_adjusted;