stardis-solver

commit 213a6da1be117cdbda807b565620d17ad0d81d9d
parent 65da61bc8ff2d761285fa22fb269edbcc0d71617
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Wed, 16 Mar 2022 16:08:09 +0100

Merge branch 'release_0.13.1'

Diffstat:
M
README.md
 | 
5
+++++
M
cmake/CMakeLists.txt
 | 
2
+-
M
src/sdis_mpi.c
 | 
2
++
M
src/sdis_solve_camera.c
 | 
4
++--
M
src/test_sdis_volumic_power3_2d.c
 | 
5
++++-

5 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
@@ -117,6 +117,11 @@ variable the install directories of its dependencies.
 
 ## Release notes
 
+### Version 0.13.1
+
+Fixed compilation errors and compilation warnings displayed on some versions of
+GCC.
+
 ### Version 0.13
 
 #### Non linear radiative transfer
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -66,7 +66,7 @@ rcmake_append_runtime_dirs(_runtime_dirs
 ###############################################################################
 set(VERSION_MAJOR 0)
 set(VERSION_MINOR 13)
-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_mpi.c b/src/sdis_mpi.c
@@ -13,6 +13,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>. */
 
+#define _POSIX_C_SOURCE 199309L /* nanosleep */
+
 #include "sdis_c.h"
 #include "sdis_device_c.h"
 #include "sdis_mpi.h"
diff --git a/src/sdis_solve_camera.c b/src/sdis_solve_camera.c
@@ -271,8 +271,8 @@ write_tile
   uint16_t x, y;
   ASSERT(buf && spp && tile);
 
-  tile_org[0] = tile->data.x * TILE_SIZE;
-  tile_org[1] = tile->data.y * TILE_SIZE;
+  tile_org[0] = (size_t)(tile->data.x * TILE_SIZE);
+  tile_org[1] = (size_t)(tile->data.y * TILE_SIZE);
 
   FOR_EACH(y, 0, TILE_SIZE) {
     const size_t pix_y = tile_org[1] + y;
diff --git a/src/test_sdis_volumic_power3_2d.c b/src/test_sdis_volumic_power3_2d.c
@@ -264,7 +264,7 @@ main(int argc, char** argv)
   struct sdis_solve_probe_args solve_args = SDIS_SOLVE_PROBE_ARGS_DEFAULT;
   struct sdis_mc T = SDIS_MC_NULL;
   double Tref;
-  double time_range[2] = { INF, INF };
+  double time_range[2];
   double pos[2];
   size_t nfails;
   size_t nreals;
@@ -272,6 +272,9 @@ main(int argc, char** argv)
 
   OK(sdis_device_create(&SDIS_DEVICE_CREATE_ARGS_DEFAULT, &dev));
 
+  time_range[0] = INF;
+  time_range[1] = INF;
+
   /* Create the fluid medium */
   fluid_shader.temperature = fluid_get_temperature;
   fluid_shader.calorific_capacity = dummy_medium_getter;