commit 8c28a1fb39f66e66f57f8be63365bce2efa668f7
parent 3411e7a80c38804c20e45779dfed4b8743771cf6
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Tue, 22 Jun 2021 17:27:10 +0200
Merge branch 'release_0.2.3'
Diffstat:
16 files changed, 50 insertions(+), 30 deletions(-)
diff --git a/README.md b/README.md
@@ -55,9 +55,14 @@ for further informations on CMake).
## Release notes
+### Version 0.2.3
+
+- Fix API break on filter function introduced by Star-3D 0.8.
+
### Version 0.2.2
-- Bump the version of the dependencies and fix the code to handle their updates.
+- Bump the version of the dependencies and fix the code to handle their
+ updates.
### Version 0.2.1
@@ -69,16 +74,14 @@ for further informations on CMake).
### Version 0.2
-- Add support of 2D scenes;
+- Add support of 2D scenes.
- Add support of the radiative flux absorption in 0D medium.
## License
-Star-GF is developed by [|Meso|Star>](http://www.meso-star.com) for
-[Électricité De France](http://researchers.edf.com/edf-researchers-209799.html)
-(EDF). It is Copyright (C) 2015-2018 EDF
-S.A., France (<syrthes-support@edf.fr>). It is a free software released under
-the [OSI](http://opensource.org)-approved GPL v3.0 license. You are welcome to
-redistribute it under certain conditions; refer to the COPYING file for
-details.
+Copyright (C) 2021 |Meso|Star> (<contact@meso-star.com>).
+Copyright (C) 2015-2018 EDF S.A., France (<syrthes-support@edf.fr>).
+Star-GF 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,3 +1,4 @@
+# Copyright (C) 2021 |Meso|Star> (contact@meso-star.com)
# Copyright (C) 2015-2018 EDF S.A., France (syrthes-support@edf.fr)
#
# This program is free software: you can redistribute it and/or modify
@@ -13,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.1)
project(star-gf C)
enable_testing()
@@ -26,8 +27,8 @@ option(NO_TEST "Disable the test" OFF)
find_package(RCMake 0.2.3 REQUIRED)
find_package(RSys 0.6 REQUIRED)
find_package(StarSP 0.7 REQUIRED)
-find_package(Star3D 0.5 REQUIRED)
-find_package(Star2D 0.1 REQUIRED)
+find_package(Star3D 0.8 REQUIRED)
+find_package(Star2D 0.5 REQUIRED)
find_package(OpenMP 1.2 REQUIRED)
include_directories(
@@ -44,7 +45,7 @@ include(rcmake_runtime)
################################################################################
set(VERSION_MAJOR 0)
set(VERSION_MINOR 2)
-set(VERSION_PATCH 2)
+set(VERSION_PATCH 3)
set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
set(SGF_FILES_SRC
diff --git a/src/sgf.h b/src/sgf.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2015-2018 EDF S.A., France (syrthes-support@edf.fr)
+/* Copyright (C) 2021 |Meso|Star> (contact@meso-star.com)
+ * Copyright (C) 2015-2018 EDF S.A., France (syrthes-support@edf.fr)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/sgf_device.c b/src/sgf_device.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2015-2018 EDF S.A., France (syrthes-support@edf.fr)
+/* Copyright (C) 2021 |Meso|Star> (contact@meso-star.com)
+ * Copyright (C) 2015-2018 EDF S.A., France (syrthes-support@edf.fr)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/sgf_device_c.h b/src/sgf_device_c.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2015-2018 EDF S.A., France (syrthes-support@edf.fr)
+/* Copyright (C) 2021 |Meso|Star> (contact@meso-star.com)
+ * Copyright (C) 2015-2018 EDF S.A., France (syrthes-support@edf.fr)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/sgf_estimator.c b/src/sgf_estimator.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2015-2018 EDF S.A., France (syrthes-support@edf.fr)
+/* Copyright (C) 2021 |Meso|Star> (contact@meso-star.com)
+ * Copyright (C) 2015-2018 EDF S.A., France (syrthes-support@edf.fr)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/sgf_realisation.h b/src/sgf_realisation.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2015-2018 EDF S.A., France (syrthes-support@edf.fr)
+/* Copyright (C) 2021 |Meso|Star> (contact@meso-star.com)
+ * Copyright (C) 2015-2018 EDF S.A., France (syrthes-support@edf.fr)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/sgf_scene.c b/src/sgf_scene.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2015-2018 EDF S.A., France (syrthes-support@edf.fr)
+/* Copyright (C) 2021 |Meso|Star> (contact@meso-star.com)
+ * Copyright (C) 2015-2018 EDF S.A., France (syrthes-support@edf.fr)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -28,11 +29,12 @@ hit_filter_s3d
(const struct s3d_hit* hit,
const float org[3],
const float dir[3],
+ const float range[2],
void* ray_data,
void* filter_data)
{
struct s3d_primitive* prim_from = ray_data;
- (void)org, (void)dir, (void)filter_data;
+ (void)org, (void)dir, (void)range, (void)filter_data;
if(!ray_data) return 0;
/* Discard primitive from which the ray starts from */
@@ -47,11 +49,12 @@ hit_filter_s2d
(const struct s2d_hit* hit,
const float org[3],
const float dir[3],
+ const float range[2],
void* ray_data,
void* filter_data)
{
struct s2d_primitive* prim_from = ray_data;
- (void)org, (void)dir, (void)filter_data;
+ (void)org, (void)dir, (void)range, (void)filter_data;
if(!ray_data) return 0;
/* Discard primitive from which the ray starts from */
diff --git a/src/sgf_scene_c.h b/src/sgf_scene_c.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2015-2018 EDF S.A., France (syrthes-support@edf.fr)
+/* Copyright (C) 2021 |Meso|Star> (contact@meso-star.com)
+ * Copyright (C) 2015-2018 EDF S.A., France (syrthes-support@edf.fr)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/test_sgf_cube.c b/src/test_sgf_cube.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2015-2018 EDF S.A., France (syrthes-support@edf.fr)
+/* Copyright (C) 2021 |Meso|Star> (contact@meso-star.com)
+ * Copyright (C) 2015-2018 EDF S.A., France (syrthes-support@edf.fr)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -139,7 +140,7 @@ check_bottom_top_medium_gf
/* Check the Gebhart factor between the bottom plane and the medium */
E = (status[2].E + status[3].E)/2;
SE = (status[2].SE + status[3].SE)/2;
- CHK(eq_eps(E, gf_bottom_medium, SE) == 1);
+ CHK(eq_eps(E, gf_bottom_medium, SE*3) == 1);
CHK(sgf_scene_end_integration(scn) == RES_OK);
}
diff --git a/src/test_sgf_device.c b/src/test_sgf_device.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2015-2018 EDF S.A., France (syrthes-support@edf.fr)
+/* Copyright (C) 2021 |Meso|Star> (contact@meso-star.com)
+ * Copyright (C) 2015-2018 EDF S.A., France (syrthes-support@edf.fr)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/test_sgf_estimator.c b/src/test_sgf_estimator.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2015-2018 EDF S.A., France (syrthes-support@edf.fr)
+/* Copyright (C) 2021 |Meso|Star> (contact@meso-star.com)
+ * Copyright (C) 2015-2018 EDF S.A., France (syrthes-support@edf.fr)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/test_sgf_scene.c b/src/test_sgf_scene.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2015-2018 EDF S.A., France (syrthes-support@edf.fr)
+/* Copyright (C) 2021 |Meso|Star> (contact@meso-star.com)
+ * Copyright (C) 2015-2018 EDF S.A., France (syrthes-support@edf.fr)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/test_sgf_square.c b/src/test_sgf_square.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2015-2018 EDF S.A., France (syrthes-support@edf.fr)
+/* Copyright (C) 2021 |Meso|Star> (contact@meso-star.com)
+ * Copyright (C) 2015-2018 EDF S.A., France (syrthes-support@edf.fr)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/test_sgf_tetrahedron.c b/src/test_sgf_tetrahedron.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2015-2018 EDF S.A., France (syrthes-support@edf.fr)
+/* Copyright (C) 2021 |Meso|Star> (contact@meso-star.com)
+ * Copyright (C) 2015-2018 EDF S.A., France (syrthes-support@edf.fr)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/test_sgf_utils.h b/src/test_sgf_utils.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2015-2018 EDF S.A., France (syrthes-support@edf.fr)
+/* Copyright (C) 2021 |Meso|Star> (contact@meso-star.com)
+ * Copyright (C) 2015-2018 EDF S.A., France (syrthes-support@edf.fr)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
