commit b6d0c1217a280c4a0e1df6c99631d687b57d7d35
parent 34c0173c5e5bc8a6863b795efb64ab2a33ea8b40
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Fri, 27 Aug 2021 11:57:55 +0200
Merge branch 'release_0.0.3'
Diffstat:
7 files changed, 47 insertions(+), 39 deletions(-)
diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ informations on CMake.
## Licenses
-Copyright (C) 2018, 2020 [|Meso|Star](http://www.meso-star.com)
+Copyright (C) 2018, 2020, 2021 [|Meso|Star](http://www.meso-star.com)
<contact@meso-star.com>. Copyright (C) 2018 Centre National de la Recherche
Scientifique (CNRS), Université Paul Sabatier
<contact-edstar@laplace.univ-tlse.fr>. HTMie is free software released under
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2018, 2020 |Meso|Star> (contact@meso-star.com)
+# Copyright (C) 2018, 2020, 2021 |Meso|Star> (contact@meso-star.com)
# Copyright (C) 2018 CNRS, Université Paul Sabatier
#
# This program is free software: you can redistribute it and/or modify
@@ -14,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(htmie)
enable_testing()
@@ -52,7 +52,7 @@ endif()
################################################################################
set(VERSION_MAJOR 0)
set(VERSION_MINOR 0)
-set(VERSION_PATCH 2)
+set(VERSION_PATCH 3)
set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
set(HTMIE_FILES_SRC htmie.c)
@@ -115,42 +115,50 @@ if(NOT NO_TEST)
endfunction()
new_test(test_htmie)
- build_test(test_htmie_load)
- set(TEST_FILES Mie_LUT_Cloud)
-
- foreach(_file IN LISTS TEST_FILES)
- set(_netcdf ${PROJECT_SOURCE_DIR}/../${_file}.nc)
- set(_script ${HTMIE_SOURCE_DIR}/dump_netcdf_data.sh)
- set(_output_base ${CMAKE_CURRENT_BINARY_DIR}/${_file})
- add_custom_command(
- OUTPUT
+ find_program(_ncdump ncdump)
+
+ if(NOT _ncdump)
+ message(WARNING
+ "The ncdump program is missing. Could not test the loading of a htmie "
+ "file.")
+ else()
+ build_test(test_htmie_load)
+
+ set(TEST_FILES Mie_LUT_Cloud)
+
+ foreach(_file IN LISTS TEST_FILES)
+ set(_netcdf ${PROJECT_SOURCE_DIR}/../${_file}.nc)
+ set(_script ${HTMIE_SOURCE_DIR}/dump_netcdf_data.sh)
+ set(_output_base ${CMAKE_CURRENT_BINARY_DIR}/${_file})
+ add_custom_command(
+ OUTPUT
+ ${_output_base}_lambda
+ ${_output_base}_macs
+ ${_output_base}_mscs
+ ${_output_base}_rmod
+ ${_output_base}_smod
+ ${_output_base}_g
+ COMMAND sh ${_script} lambda ${_netcdf}
+ COMMAND sh ${_script} macs ${_netcdf}
+ COMMAND sh ${_script} mscs ${_netcdf}
+ COMMAND sh ${_script} rmod ${_netcdf}
+ COMMAND sh ${_script} smod ${_netcdf}
+ COMMAND sh ${_script} g ${_netcdf}
+ DEPENDS ${_script}
+ COMMENT "Dump data of the ${_file} NetCDF"
+ VERBATIM)
+ add_test(test_htmie_load_${_file}
+ test_htmie_load ${_netcdf} ${CMAKE_CURRENT_BINARY_DIR})
+ add_custom_target(dump-${_file}.nc ALL DEPENDS
${_output_base}_lambda
${_output_base}_macs
${_output_base}_mscs
${_output_base}_rmod
${_output_base}_smod
- ${_output_base}_g
- COMMAND sh ${_script} lambda ${_netcdf}
- COMMAND sh ${_script} macs ${_netcdf}
- COMMAND sh ${_script} mscs ${_netcdf}
- COMMAND sh ${_script} rmod ${_netcdf}
- COMMAND sh ${_script} smod ${_netcdf}
- COMMAND sh ${_script} g ${_netcdf}
- DEPENDS ${_script}
- COMMENT "Dump data of the ${_file} NetCDF"
- VERBATIM)
- add_test(test_htmie_load_${_file}
- test_htmie_load ${_netcdf} ${CMAKE_CURRENT_BINARY_DIR})
- add_custom_target(dump-${_file}.nc ALL DEPENDS
- ${_output_base}_lambda
- ${_output_base}_macs
- ${_output_base}_mscs
- ${_output_base}_rmod
- ${_output_base}_smod
- ${_output_base}_g)
- endforeach()
-
+ ${_output_base}_g)
+ endforeach()
+ endif()
endif()
################################################################################
diff --git a/src/htmie.c b/src/htmie.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018, 2020 |Meso|Star> (contact@meso-star.com)
+/* Copyright (C) 2018, 2020, 2021 |Meso|Star> (contact@meso-star.com)
* Copyright (C) 2018 CNRS, Université Paul Sabatier
*
* This program is free software: you can redistribute it and/or modify
diff --git a/src/htmie.h b/src/htmie.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018, 2020 |Meso|Star> (contact@meso-star.com)
+/* Copyright (C) 2018, 2020, 2021 |Meso|Star> (contact@meso-star.com)
* Copyright (C) 2018 CNRS, Université Paul Sabatier
*
* This program is free software: you can redistribute it and/or modify
diff --git a/src/test_htmie.c b/src/test_htmie.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018, 2020 |Meso|Star> (contact@meso-star.com)
+/* Copyright (C) 2018, 2020, 2021 |Meso|Star> (contact@meso-star.com)
* Copyright (C) 2018 CNRS, Université Paul Sabatier
*
* This program is free software: you can redistribute it and/or modify
diff --git a/src/test_htmie_load.c b/src/test_htmie_load.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018, 2020 |Meso|Star> (contact@meso-star.com)
+/* Copyright (C) 2018, 2020, 2021 |Meso|Star> (contact@meso-star.com)
* Copyright (C) 2018 CNRS, Université Paul Sabatier
*
* This program is free software: you can redistribute it and/or modify
diff --git a/src/test_htmie_utils.h b/src/test_htmie_utils.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018, 2020 |Meso|Star> (contact@meso-star.com)
+/* Copyright (C) 2018, 2020, 2021 |Meso|Star> (contact@meso-star.com)
* Copyright (C) 2018 CNRS, Université Paul Sabatier
*
* This program is free software: you can redistribute it and/or modify
