commit 3d3c544edf350774bf717668fd5f7daf799f07d0 parent 0889082d8b2920ed0acb9c47cc1f80470e74cfa4 Author: Vincent Forest <vincent.forest@meso-star.com> Date: Tue, 19 Oct 2021 16:09:17 +0200 Merge branch 'release_0.9.1' Diffstat:
65 files changed, 179 insertions(+), 108 deletions(-)
diff --git a/README.md b/README.md @@ -60,11 +60,18 @@ informations on CMake. ## Release notes +### Version 0.9.1 + +- Sets the CMake minimum version to 3.1: since CMake 3.20, version 2.8 has + become obsolete. +- Sets the required version of Star-SampPling to 0.12. This version fixes + compilation errors with gcc 11 but introduces API breaks. + ### Version 0.9 -- Add the `-G` option that saves and restores the state of the random number - generator. This option can be used to ensure the statistical independence - between successive runs. +Add the `-G` option that saves and restores the state of the random number +generator. This option can be used to ensure the statistical independence +between successive runs. ### Version 0.8.2 @@ -74,10 +81,10 @@ informations on CMake. ### Version 0.8.1 -- Fix the VTK of the receiver map: the receiver map was written as `double` - while the type notified in the VTK file was `float`. This might produce - errors on loading of the resulting VTK file. The VTK data type is now set to - `double` to make it consistent with the type of the written values. +Fix the VTK of the receiver map: the receiver map was written as `double` while +the type notified in the VTK file was `float`. This might produce errors on +loading of the resulting VTK file. The VTK data type is now set to `double` to +make it consistent with the type of the written values. ### Version 0.8 @@ -137,8 +144,8 @@ for each triangle of a receiver. Its value can be: ### Version 0.5 -- Improve the performances of the solver up to 50% in situations where the - radiative random walks bounce on many surfaces. +Improve the performances of the solver up to 50% in situations where the +radiative random walks bounce on many surfaces. ### Version 0.4.1 @@ -200,10 +207,10 @@ for each triangle of a receiver. Its value can be: ## License -Solstice is developed by [|Meso|Star>](http://www.meso-star.com) for the -[National Center for Scientific Research](http://www.cnrs.fr/index.php) (CNRS). -Copyright (C) 2016-2018 CNRS, 2018-2019 -[|Meso|Star>](http://www.meso-star.com). It 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. +Copyright (C) 2018, 2019, 2021 |Meso|Star> (<contact@meso-star.com>). +Copyright (C) 2016-2018 CNRS. + +Solstice 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,5 @@ -# Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +# Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) +# Copyright (C) 2016-2018 CNRS # # 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 @@ -13,14 +14,14 @@ # 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(solstice C) enable_testing() option(NO_TEST "Do not build tests" OFF) if(CMAKE_HOST_UNIX) - set(SOLSTICE_DOC "TROFF & HTML" CACHE STRING + set(SOLSTICE_DOC "TROFF" CACHE STRING "Type of documentation to generate and install.") else() set(SOLSTICE_DOC "HTML" CACHE STRING @@ -42,13 +43,13 @@ get_filename_component(_current_source_dir ${CMAKE_CURRENT_LIST_FILE} PATH) set(LibYAML_DIR ${_current_source_dir}/) find_package(LibYAML REQUIRED) -find_package(RCMake 0.2.3 REQUIRED) -find_package(RSys 0.6 REQUIRED) -find_package(SolAnim 0.2 REQUIRED) -find_package(SolSolver 0.8 REQUIRED) -find_package(Star3DUT 0.2 REQUIRED) -find_package(StarSP 0.8 REQUIRED) -find_package(StarSTL 0.3.1 REQUIRED) +find_package(RCMake 0.4 REQUIRED) +find_package(RSys 0.10 REQUIRED) +find_package(SolAnim 0.2.3 REQUIRED) +find_package(SolSolver 0.9 REQUIRED) +find_package(Star3DUT 0.3.1 REQUIRED) +find_package(StarSP 0.12 REQUIRED) +find_package(StarSTL 0.3.3 REQUIRED) if(MSVC) find_package(MuslGetopt REQUIRED) @@ -97,7 +98,7 @@ configure_file(${SOLSTICE_SOURCE_DIR}/../doc/solstice.1.txt.in set(VERSION_MAJOR 0) set(VERSION_MINOR 9) -set(VERSION_PATCH 0) +set(VERSION_PATCH 1) set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}) configure_file(${SOLSTICE_SOURCE_DIR}/solstice_version.h.in diff --git a/cmake/LibYAMLConfig.cmake b/cmake/LibYAMLConfig.cmake @@ -1,4 +1,5 @@ -# Copyright (C) 2015-2016 CNRS +# Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) +# Copyright (C) 2016-2018 CNRS # # 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 @@ -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) # Try to find the LibYAML devel. Once done this will define: # - LibYAML_FOUND: system has LibYAML diff --git a/cmake/doc/CMakeLists.txt b/cmake/doc/CMakeLists.txt @@ -1,4 +1,5 @@ -# Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +# Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) +# Copyright (C) 2016-2018 CNRS # # 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 @@ -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) string(REGEX MATCH ".*HTML.*" _html ${SOLSTICE_DOC}) string(REGEX MATCH ".*ROFF.*" _roff ${SOLSTICE_DOC}) @@ -144,7 +145,7 @@ if(_html) endforeach() add_custom_target(man-html ALL DEPENDS ${MAN_FILES}) - install(FILES ${MAN1_FILES} DESTINATION share/man/man1) - install(FILES ${MAN5_FILES} DESTINATION share/man/man5) + install(FILES ${MAN1_FILES} DESTINATION share/doc/solstice/html) + install(FILES ${MAN5_FILES} DESTINATION share/doc/solstice/html) endif() diff --git a/cmake/parser/CMakeLists.txt b/cmake/parser/CMakeLists.txt @@ -1,4 +1,5 @@ -# Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +# Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) +# Copyright (C) 2016-2018 CNRS # # 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 @@ -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(solstice-parser C) set(SOLPARSER_SOURCE_DIR ${PROJECT_SOURCE_DIR}/../../src/parser) diff --git a/cmake/receivers/CMakeLists.txt b/cmake/receivers/CMakeLists.txt @@ -1,4 +1,5 @@ -# Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +# Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) +# Copyright (C) 2016-2018 CNRS # # 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 @@ -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(srcvl C) set(SRCVL_SOURCE_DIR ${PROJECT_SOURCE_DIR}/../../src/receivers) diff --git a/src/main.c b/src/main.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/parser/solparser.c b/src/parser/solparser.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/parser/solparser.h b/src/parser/solparser.h @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/parser/solparser_atmosphere.c b/src/parser/solparser_atmosphere.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/parser/solparser_atmosphere.h b/src/parser/solparser_atmosphere.h @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/parser/solparser_c.h b/src/parser/solparser_c.h @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/parser/solparser_entity.c b/src/parser/solparser_entity.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/parser/solparser_entity.h b/src/parser/solparser_entity.h @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/parser/solparser_geometry.c b/src/parser/solparser_geometry.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/parser/solparser_geometry.h b/src/parser/solparser_geometry.h @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/parser/solparser_image.c b/src/parser/solparser_image.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/parser/solparser_image.h b/src/parser/solparser_image.h @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/parser/solparser_material.c b/src/parser/solparser_material.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/parser/solparser_material.h b/src/parser/solparser_material.h @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/parser/solparser_medium.c b/src/parser/solparser_medium.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/parser/solparser_medium.h b/src/parser/solparser_medium.h @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/parser/solparser_mtl_data.c b/src/parser/solparser_mtl_data.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/parser/solparser_mtl_data.h b/src/parser/solparser_mtl_data.h @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/parser/solparser_pivot.c b/src/parser/solparser_pivot.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/parser/solparser_pivot.h b/src/parser/solparser_pivot.h @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/parser/solparser_shape.h b/src/parser/solparser_shape.h @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/parser/solparser_spectrum.c b/src/parser/solparser_spectrum.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/parser/solparser_spectrum.h b/src/parser/solparser_spectrum.h @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/parser/solparser_sun.c b/src/parser/solparser_sun.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/parser/solparser_sun.h b/src/parser/solparser_sun.h @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/parser/test_solparser.c b/src/parser/test_solparser.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/parser/test_solparser2.c b/src/parser/test_solparser2.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/parser/test_solparser3.c b/src/parser/test_solparser3.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/parser/test_solparser4.c b/src/parser/test_solparser4.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/parser/test_solparser5.c b/src/parser/test_solparser5.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/parser/test_solparser6.c b/src/parser/test_solparser6.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/parser/test_solparser7.c b/src/parser/test_solparser7.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/parser/test_solparser8.c b/src/parser/test_solparser8.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/parser/test_solparser_mirror.c b/src/parser/test_solparser_mirror.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/parser/test_solparser_normal_map.c b/src/parser/test_solparser_normal_map.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/parser/test_solparser_spectrum.c b/src/parser/test_solparser_spectrum.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/receivers/srcvl.c b/src/receivers/srcvl.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/receivers/srcvl.h b/src/receivers/srcvl.h @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/receivers/test_srcvl.c b/src/receivers/test_srcvl.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/receivers/test_srcvl2.c b/src/receivers/test_srcvl2.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/solstice.c b/src/solstice.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/solstice.h b/src/solstice.h @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/solstice_args.c b/src/solstice_args.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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 @@ -77,9 +78,11 @@ print_help(const char* program) " --version display version information and exit.\n"); printf("\n"); printf( -"Solstice (C) 2016-2018 CNRS, 2018-2019 |Meso|Star>. This is a free software\n" -"released under the GNU GPL license, version 3 or later. You are free to change\n" -"or redistribute it under certain conditions <http://gnu.org/licenses/gpl.html>.\n"); +"Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com).\n" +"Copyright (C) 2016-2018 CNRS.\n" +"Solstice is a free software released under the GNU GPL license, version 3 or\n" +"later. You are free to change or redistribute it under certain conditions\n" +"<http://gnu.org/licenses/gpl.html>.\n"); } static res_T diff --git a/src/solstice_atmosphere.c b/src/solstice_atmosphere.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/solstice_c.h b/src/solstice_c.h @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/solstice_draw.c b/src/solstice_draw.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/solstice_dump.c b/src/solstice_dump.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/solstice_entity.c b/src/solstice_entity.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/solstice_material.c b/src/solstice_material.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/solstice_node.c b/src/solstice_node.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/solstice_object.c b/src/solstice_object.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/solstice_solve.c b/src/solstice_solve.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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 @@ -542,7 +543,7 @@ solstice_solve(struct solstice* solstice) res_T res = RES_OK; ASSERT(solstice); - res = ssp_rng_create(solstice->allocator, &ssp_rng_threefry, &rng); + res = ssp_rng_create(solstice->allocator, SSP_RNG_THREEFRY, &rng); if(res != RES_OK) { fprintf(stderr, "Could not create the Random Number Generator .\n"); goto error; diff --git a/src/solstice_spectrum.c b/src/solstice_spectrum.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/solstice_sun.c b/src/solstice_sun.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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/solstice_sun_spectrum.c b/src/solstice_sun_spectrum.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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 @@ -767,6 +768,4 @@ const double solstice_sun_spectrum_smarts[] = { }; const size_t solstice_sun_spectrum_smarts_size = - sizeof(solstice_sun_spectrum_smarts) / sizeof(double[2]); - - + sizeof(solstice_sun_spectrum_smarts) / (2*sizeof(double)); diff --git a/src/solstice_sun_spectrum.h b/src/solstice_sun_spectrum.h @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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_solstice_args.c b/src/test_solstice_args.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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_solstice_simulation.c b/src/test_solstice_simulation.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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 @@ -163,7 +164,7 @@ mkstemp(char *tmpl) } value += random_time_bits ^ (unsigned long long)GetCurrentThreadId(); - for (count = 0; count < attempts; value += 7777, ++count) { + for(count = 0; count < attempts; value += 7777, ++count) { unsigned long long v = value; /* Fill in the random bits. */ @@ -389,13 +390,13 @@ check_1_reference /* both files' pointer are just past the new bloc header */ - for (n = 0; n < counts->global; n++) { + for(n = 0; n < counts->global; n++) { double reference_E, reference_SE, test_E, test_SE; read_global(ref_file, &reference_E, &reference_SE); read_global(test_file, &test_E, &test_SE); check_estimate(reference_E, reference_SE, test_E, test_SE); } - for (n = 0; n < counts->receiver; n++) { + for(n = 0; n < counts->receiver; n++) { char ref_rcv_name[MAX_LINE_LEN], test_rcv_name[MAX_LINE_LEN]; double reference_E[RECEIVER_RESULTS_COUNT__]; double reference_SE[RECEIVER_RESULTS_COUNT__]; @@ -410,7 +411,7 @@ check_1_reference check_estimate(reference_E[r], reference_SE[r], test_E[r], test_SE[r]); } } - for (n = 0; n < counts->primary; n++) { + for(n = 0; n < counts->primary; n++) { char ref_prim_name[MAX_LINE_LEN], test_prim_name[MAX_LINE_LEN]; double reference_E[PRIMARY_RESULTS_COUNT__]; double reference_SE[PRIMARY_RESULTS_COUNT__]; @@ -423,11 +424,11 @@ check_1_reference read_primary(test_file, test_prim_name, &test_area, test_E, test_SE); check_estimate(ref_area, 0, test_area, 0); CHK(strcmp(ref_prim_name, test_prim_name) == 0); - FOR_EACH(r, FIRST_RECEIVER_RESULT, PRIMARY_RESULTS_COUNT__) { + FOR_EACH(r, FIRST_PRIMARY_RESULT, PRIMARY_RESULTS_COUNT__) { check_estimate(reference_E[r], reference_SE[r], test_E[r], test_SE[r]); } } - for (n = 0; n < counts->receiver * counts->primary; n++) { + for(n = 0; n < counts->receiver * counts->primary; n++) { double reference_E[RECEIVER_RESULTS_COUNT__]; double reference_SE[RECEIVER_RESULTS_COUNT__]; double test_E[RECEIVER_RESULTS_COUNT__]; diff --git a/src/test_solstice_utils.h b/src/test_solstice_utils.h @@ -1,4 +1,5 @@ -/* Copyright (C) 2016-2018 CNRS, 2018-2019 |Meso|Star> +/* Copyright (C) 2018, 2019, 2021 |Meso|Star> (contact@meso-star.com) + * Copyright (C) 2016-2018 CNRS * * 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