commit 1537eb2b00f733faedaa70327c818f27f0981526
parent dafade50cb4f5af6f02b4f406e5bbcdfb7022107
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Thu, 14 Oct 2021 09:55:20 +0200
Merge branch 'release_0.8.1'
Diffstat:
11 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/README.md b/README.md
@@ -76,6 +76,11 @@ informations on CMake.
## Release notes
+### Version 0.8.1
+
+Sets the required version of Star-SampPling to 0.12. This version fixes
+compilation errors with gcc 11 but introduce API breaks.
+
### Version 0.8
- Adds support for a thin lens camera model and an orthographic camera model
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -24,7 +24,7 @@ set(HTRDR_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR})
set(VERSION_MAJOR 0)
set(VERSION_MINOR 8)
-set(VERSION_PATCH 0)
+set(VERSION_PATCH 1)
set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
option(HTRDR_BUILD_ATMOSPHERE "Build the htrdr-atmosphere program" ON)
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/doc/htrdr-atmosphere.1.txt.in b/doc/htrdr-atmosphere.1.txt.in
@@ -56,9 +56,11 @@ listed in the *htrdr-material*(5) file provided through the *-M* option. Both,
the clouds and the ground, can be infinitely repeated along the X and Y axis by
setting the *-r* and the *-R* options, respectively.
-Two types of sensor are supported by *htrdr-atmosphere*. The camera (*-C*
-_camera_) is used to render an image of the scene from the given point of view
-while the rectangle sensor (*-p* _rectangle_) is used to compute a flux map.
+Four types of sensor are supported by *htrdr-atmosphere*. The pinhole and thin
+lens camera (*-C* _camera_) are used to render an image of the scene from the
+given point of view. The orthographic camera (*-P* _camera_) render the scene
+with a parallel projection rather than a perspective projection. Finally, the
+rectangle sensor (*-p* _rectangle_) is used to compute a flux map.
Spectral dimension can be integrated in many ways (*-s* option). When rendering
an image (*-C* _camera_), the computation is by default performed for the
@@ -110,7 +112,7 @@ OPTIONS
**focal-length**=**_length_**;;
Focal length of a camera lens. It is another way to control the field of
- view of a thin lens camera. Be default, the field of view is directly set
+ view of a thin lens camera. By default, the field of view is directly set
through the **fov** parameter.
**fov**=**_angle_**;;
diff --git a/doc/htrdr-combustion.1.txt.in b/doc/htrdr-combustion.1.txt.in
@@ -88,7 +88,7 @@ OPTIONS
**focal-length**=**_length_**;;
Focal length of a camera lens. It is another way to control the field of
- view of a thin lens camera. Be default, the field of view is directly set
+ view of a thin lens camera. By default, the field of view is directly set
through the **fov** parameter.
**fov**=**_angle_**;;
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;
diff --git a/src/core/htrdr_ran_wlen.c b/src/core/htrdr_ran_wlen.c
@@ -199,7 +199,7 @@ wlen_ran_sample_continue
const double B_lambda = htrdr_planck(lambda_m, lambda_m, Tref);
const double B_mean = htrdr_planck(range_m[0], range_m[1], Tref);
*pdf = B_lambda / (B_mean * (range_m[1]-range_m[0]));
- *pdf = 1.e-9; /* Transform from m^-1 to nm^-1 */
+ *pdf *= 1.e-9; /* Transform from m^-1 to nm^-1 */
}
return lambda_m * 1.e9; /* Convert in nanometers */
diff --git a/src/core/htrdr_slab.c b/src/core/htrdr_slab.c
@@ -31,8 +31,8 @@ htrdr_slab_trace_ray
const double org[3],
const double dir[3],
const double range[2],
- const double cell_low[2],
- const double cell_upp[2],
+ const double cell_low[3],
+ const double cell_upp[3],
htrdr_trace_cell_T trace_cell,
const size_t max_steps,
void* trace_cell_context)
diff --git a/src/core/htrdr_slab.h b/src/core/htrdr_slab.h
@@ -41,8 +41,8 @@ htrdr_slab_trace_ray
const double org[3],
const double dir[3],
const double range[2],
- const double cell_low[2],
- const double cell_upp[2],
+ const double cell_low[3],
+ const double cell_upp[3],
htrdr_trace_cell_T trace_cell,
const size_t max_steps, /* Max traversed cell */
void* trace_cell_context);
