commit 4df31981118ddb14090351d262eb76ddaa8d25db
parent e22e0f6696d2bc93656b223dea6f0c646a4bb568
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Wed, 20 Oct 2021 09:17:32 +0200
Merge branch 'release_0.4.1'
Diffstat:
12 files changed, 26 insertions(+), 19 deletions(-)
diff --git a/README.md b/README.md
@@ -34,6 +34,11 @@ generate the project from the `cmake/CMakeLists.txt` file by appending to the
## Release notes
+### Version 0.4.1
+
+Sets the required version of Star-SampPling to 0.12. This version fixes
+compilation errors with gcc 11 but introduces API breaks.
+
### Version 0.4
- Update the `struct sschiff_geometry_distribution` data structure. The
@@ -50,8 +55,10 @@ generate the project from the `cmake/CMakeLists.txt` file by appending to the
## Copying
-Copyright (C) 2020 |Meso|Star> (contact@meso-star.com). Copyright (C) 2015, 2016
-CNRS. Star-Schiff is free software released under the GPL v3+ license: GNU GPL
+Copyright (C) 2020, 2021 |Meso|Star> (<contact@meso-star.com>).
+Copyright (C) 2015, 2016 CNRS.
+
+Star-Schiff is free software released under the GPL v3+ license: GNU GPL
version 3 or later. You are welcome to redistribute it under certain
conditions; refer to the COPYING file for details.
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2020 |Meso|Star> (contact@meso-star.com)
+# Copyright (C) 2020, 2021 |Meso|Star> (contact@meso-star.com)
# Copyright (C) 2015, 2016 CNRS
#
# This program is free software: you can redistribute it and/or modify
@@ -26,8 +26,8 @@ option(NO_TEST "Disable the test" OFF)
################################################################################
find_package(RCMake 0.4 REQUIRED)
find_package(RSys 0.8 REQUIRED)
-find_package(StarSP 0.8 REQUIRED)
-find_package(Star3D 0.7 REQUIRED)
+find_package(StarSP 0.12 REQUIRED)
+find_package(Star3D 0.8 REQUIRED)
find_package(OpenMP 1.2 REQUIRED)
find_package(PkgConfig REQUIRED)
@@ -61,7 +61,7 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-omit-frame-pointer")
################################################################################
set(VERSION_MAJOR 0)
set(VERSION_MINOR 4)
-set(VERSION_PATCH 0)
+set(VERSION_PATCH 1)
set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
set(SSCHIFF_FILES_SRC
diff --git a/src/sschiff.h b/src/sschiff.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2020 |Meso|Star> (contact@meso-star.com)
+/* Copyright (C) 2020, 2021 |Meso|Star> (contact@meso-star.com)
* Copyright (C) 2015, 2016 CNRS
*
* This program is free software: you can redistribute it and/or modify
diff --git a/src/sschiff_device.c b/src/sschiff_device.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2020 |Meso|Star> (contact@meso-star.com)
+/* Copyright (C) 2020, 2021 |Meso|Star> (contact@meso-star.com)
* Copyright (C) 2015, 2016 CNRS
*
* This program is free software: you can redistribute it and/or modify
diff --git a/src/sschiff_device.h b/src/sschiff_device.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2020 |Meso|Star> (contact@meso-star.com)
+/* Copyright (C) 2020, 2021 |Meso|Star> (contact@meso-star.com)
* Copyright (C) 2015, 2016 CNRS
*
* This program is free software: you can redistribute it and/or modify
diff --git a/src/sschiff_estimator.c b/src/sschiff_estimator.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2020 |Meso|Star> (contact@meso-star.com)
+/* Copyright (C) 2020, 2021 |Meso|Star> (contact@meso-star.com)
* Copyright (C) 2015, 2016 CNRS
*
* This program is free software: you can redistribute it and/or modify
diff --git a/src/sschiff_scattering_angles_distributions.c b/src/sschiff_scattering_angles_distributions.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2020 |Meso|Star> (contact@meso-star.com)
+/* Copyright (C) 2020, 2021 |Meso|Star> (contact@meso-star.com)
* Copyright (C) 2015, 2016 CNRS
*
* This program is free software: you can redistribute it and/or modify
diff --git a/src/test_sschiff_device.c b/src/test_sschiff_device.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2020 |Meso|Star> (contact@meso-star.com)
+/* Copyright (C) 2020, 2021 |Meso|Star> (contact@meso-star.com)
* Copyright (C) 2015, 2016 CNRS
*
* This program is free software: you can redistribute it and/or modify
diff --git a/src/test_sschiff_estimator_cylinder.c b/src/test_sschiff_estimator_cylinder.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2020 |Meso|Star> (contact@meso-star.com)
+/* Copyright (C) 2020, 2021 |Meso|Star> (contact@meso-star.com)
* Copyright (C) 2015, 2016 CNRS
*
* This program is free software: you can redistribute it and/or modify
@@ -439,7 +439,7 @@ main(int argc, char** argv)
CHK(s3d_device_create(NULL, &allocator, 0, &s3d) == RES_OK);
CHK(s3d_shape_create_mesh(s3d, &shape) == RES_OK);
- CHK(ssp_rng_create(&allocator, &ssp_rng_threefry, &rng) == RES_OK);
+ CHK(ssp_rng_create(&allocator, SSP_RNG_THREEFRY, &rng) == RES_OK);
CHK(sschiff_device_create
(NULL, &allocator, SSCHIFF_NTHREADS_DEFAULT, 1, s3d, &dev) == RES_OK);
diff --git a/src/test_sschiff_estimator_rhodo.c b/src/test_sschiff_estimator_rhodo.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2020 |Meso|Star> (contact@meso-star.com)
+/* Copyright (C) 2020, 2021 |Meso|Star> (contact@meso-star.com)
* Copyright (C) 2015, 2016 CNRS
*
* This program is free software: you can redistribute it and/or modify
@@ -2629,7 +2629,7 @@ main(int argc, char** argv)
mem_init_proxy_allocator(&allocator, &mem_default_allocator);
CHK(s3d_device_create(NULL, &allocator, 0, &s3d) == RES_OK);
CHK(s3d_shape_create_mesh(s3d, &shape) == RES_OK);
- CHK(ssp_rng_create(&allocator, &ssp_rng_threefry, &rng) == RES_OK);
+ CHK(ssp_rng_create(&allocator, SSP_RNG_THREEFRY, &rng) == RES_OK);
CHK(sschiff_device_create
(NULL, &allocator, SSCHIFF_NTHREADS_DEFAULT, 1, NULL, &dev) == RES_OK);
diff --git a/src/test_sschiff_estimator_sphere.c b/src/test_sschiff_estimator_sphere.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2020 |Meso|Star> (contact@meso-star.com)
+/* Copyright (C) 2020, 2021 |Meso|Star> (contact@meso-star.com)
* Copyright (C) 2015, 2016 CNRS
*
* This program is free software: you can redistribute it and/or modify
@@ -200,7 +200,7 @@ main(int argc, char** argv)
mem_init_proxy_allocator(&allocator, &mem_default_allocator);
- CHK(ssp_rng_create(&allocator, &ssp_rng_threefry, &rng) == RES_OK);
+ CHK(ssp_rng_create(&allocator, SSP_RNG_THREEFRY, &rng) == RES_OK);
CHK(sschiff_device_create
(NULL, &allocator, SSCHIFF_NTHREADS_DEFAULT, 1, NULL, &dev) == RES_OK);
diff --git a/src/test_sschiff_utils.h b/src/test_sschiff_utils.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2020 |Meso|Star> (contact@meso-star.com)
+/* Copyright (C) 2020, 2021 |Meso|Star> (contact@meso-star.com)
* Copyright (C) 2015, 2016 CNRS
*
* This program is free software: you can redistribute it and/or modify
