htcp

commit 5ef71ee7df4d54ec6be0a949b3954c67a2985e4f
parent 3e5cafe5491c3185340ea0613b4b3a6e36629bdf
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Mon,  9 Jan 2023 10:39:56 +0100

Merge branch 'release_0.0.4' into develop

Diffstat:
M
README.md
 | 
26
+++++++++++++++++++++++++-
M
cmake/CMakeLists.txt
 | 
7
++++++-
M
cmake/htcp/CMakeLists.txt
 | 
10
+++-------
M
cmake/les2htcp/CMakeLists.txt
 | 
10
+++-------
M
doc/htcp.5.scd
 | 
2
+-
M
doc/les2htcp.1.scd
 | 
2
+-
M
src/htcp.c
 | 
2
+-
M
src/htcp.h
 | 
2
+-
M
src/les2htcp.c
 | 
2
+-
M
src/test_htcp.c
 | 
2
+-
M
src/test_htcp_load.c
 | 
2
+-
M
src/test_htcp_load_from_file.c
 | 
2
+-
M
src/test_htcp_utils.h
 | 
2
+-

13 files changed, 46 insertions(+), 25 deletions(-)
diff --git a/README.md b/README.md
@@ -28,9 +28,33 @@ resulting project can be edited, built, tested and installed as any CMake
 project. Refer to the [CMake](https://cmake.org/documentation) for further
 informations on CMake.
 
+## Release notes
+
+### Version 0.0.4
+
+- Use scdoc rather than asciidoc as file format for man sources.
+- Make internal shell scripts POSIX compliant.
+
+### Version 0.0.3
+
+- Fix a man page error: the RCT field was named "liquid vapor mixing report"
+  rather than "liquid _water_ mixing report".
+- Miscellaneous minor corrections to log messages.
+
+### Version 0.0.2
+
+Fix the les2htcp man page. The units were incorrect for the water vapor
+mixing ratio and the liquid water mixing ratio.
+
+### Version 0.0.1
+
+- Fix warnings and compilation errors when using the NetCDF library in version
+  4.4.0.
+- Fix compilation errors on systems with GNU C library version less than 2.19.
+
 ## Copyright notice
 
-Copyright (C) 2018, 2020-2022 |Méso|Star> (<contact@meso-star.com>)  
+Copyright (C) 2018, 2020-2023 |Méso|Star> (<contact@meso-star.com>)  
 Copyright (C) 2018 Centre National de la Recherche Scientifique (CNRS)  
 Copyright (C) 2018 Université Paul Sabatier (<contact-edstar@laplace.univ-tlse.fr>)
 
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2018, 2020-2022 |Méso|Star> (contact@meso-star.com)
+# Copyright (C) 2018, 2020-2023 |Méso|Star> (contact@meso-star.com)
 # Copyright (C) 2018 CNRS
 # Copyright (C) 2018 Université Paul Sabatier (contact-edstar@laplace.univ-tlse.fr)
 #
@@ -60,6 +60,11 @@ endif()
 ################################################################################
 # Sub projects
 ################################################################################
+set(VERSION_MAJOR 0)
+set(VERSION_MINOR 0)
+set(VERSION_PATCH 4)
+set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
+
 add_subdirectory(doc)
 add_subdirectory(htcp)
 add_subdirectory(les2htcp)
diff --git a/cmake/htcp/CMakeLists.txt b/cmake/htcp/CMakeLists.txt
@@ -1,5 +1,6 @@
-# Copyright (C) 2018, 2020, 2021 |Meso|Star> (contact@meso-star.com)
-# Copyright (C) 2018 CNRS, Université Paul Sabatier
+# Copyright (C) 2018, 2020-2023 |Méso|Star> (contact@meso-star.com)
+# Copyright (C) 2018 CNRS
+# Copyright (C) 2018 Université Paul Sabatier
 #
 # 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
@@ -20,11 +21,6 @@ project(htcp-library C)
 ################################################################################
 # Configure and define targets
 ################################################################################
-set(VERSION_MAJOR 0)
-set(VERSION_MINOR 0)
-set(VERSION_PATCH 3)
-set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
-
 set(HTCP_FILES_SRC htcp.c)
 set(HTCP_FILES_INC )
 set(HTCP_FILES_INC_API htcp.h)
diff --git a/cmake/les2htcp/CMakeLists.txt b/cmake/les2htcp/CMakeLists.txt
@@ -1,5 +1,6 @@
-# Copyright (C) 2018, 2020, 2021 |Meso|Star> (contact@meso-star.com)
-# Copyright (C) 2018 CNRS, Université Paul Sabatier
+# Copyright (C) 2018, 2020-2023 |Méso|Star> (contact@meso-star.com)
+# Copyright (C) 2018 CNRS
+# Copyright (C) 208 Université Paul Sabatier
 #
 # 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
@@ -35,11 +36,6 @@ include_directories(
 ################################################################################
 # Generate files
 ################################################################################
-set(VERSION_MAJOR 0)
-set(VERSION_MINOR 0)
-set(VERSION_PATCH 2)
-set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
-
 configure_file(${HTCP_SOURCE_DIR}/les2htcp.h.in
   ${CMAKE_CURRENT_BINARY_DIR}/les2htcp.h @ONLY)
 
diff --git a/doc/htcp.5.scd b/doc/htcp.5.scd
@@ -1,6 +1,6 @@
 htcp(5)
 
-; Copyright (C) 2018, 2020-2022 |Méso|Star> (contact@meso-star.com)
+; Copyright (C) 2018, 2020-2023 |Méso|Star> (contact@meso-star.com)
 ; Copyright (C) 2018 CNRS
 ; Copyright (C) 2018 Université Paul Sabatier (contact-edstar@laplace.univ-tlse.fr)
 ; 
diff --git a/doc/les2htcp.1.scd b/doc/les2htcp.1.scd
@@ -1,6 +1,6 @@
 les2htcp(1)
 
-; Copyright (C) 2018, 2020-2022 |Méso|Star> (contact@meso-star.com)
+; Copyright (C) 2018, 2020-2023 |Méso|Star> (contact@meso-star.com)
 ; Copyright (C) 2018 Centre National de la Recherche Scientifique
 ; Copyright (C) 2018 Université Paul Sabatier (contact-edstar@laplace.univ-tlse.fr)
 ; 
diff --git a/src/htcp.c b/src/htcp.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018, 2020-2022 |Méso|Star> (contact@meso-star.com)
+/* Copyright (C) 2018, 2020-2023 |Méso|Star> (contact@meso-star.com)
  * Copyright (C) 2018 CNRS
  * Copyright (C) 2018 Université Paul Sabatier (contact-edstar@laplace.univ-tlse.fr)
  *
diff --git a/src/htcp.h b/src/htcp.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018, 2020-2022 |Méso|Star> (contact@meso-star.com)
+/* Copyright (C) 2018, 2020-2023 |Méso|Star> (contact@meso-star.com)
  * Copyright (C) 2018 CNRS
  * Copyright (C) 2018 Université Paul Sabatier (contact-edstar@laplace.univ-tlse.fr)
  *
diff --git a/src/les2htcp.c b/src/les2htcp.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018, 2020-2022 |Méso|Star> (contact@meso-star.com)
+/* Copyright (C) 2018, 2020-2023 |Méso|Star> (contact@meso-star.com)
  * Copyright (C) 2018 CNRS
  * Copyright (C) 2018 Université Paul Sabatier (contact-edstar@laplace.univ-tlse.fr)
  *
diff --git a/src/test_htcp.c b/src/test_htcp.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018, 2020-2022 |Méso|Star> (contact@meso-star.com)
+/* Copyright (C) 2018, 2020-2023 |Méso|Star> (contact@meso-star.com)
  * Copyright (C) 2018 CNRS
  * Copyright (C) 2018 Université Paul Sabatier (contact-edstar@laplace.univ-tlse.fr)
  *
diff --git a/src/test_htcp_load.c b/src/test_htcp_load.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018, 2020-2022 |Méso|Star> (contact@meso-star.com)
+/* Copyright (C) 2018, 2020-2023 |Méso|Star> (contact@meso-star.com)
  * Copyright (C) 2018 CNRS
  * Copyright (C) 2018 Université Paul Sabatier (contact-edstar@laplace.univ-tlse.fr)
  *
diff --git a/src/test_htcp_load_from_file.c b/src/test_htcp_load_from_file.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018, 2020-2022 |Méso|Star> (contact@meso-star.com)
+/* Copyright (C) 2018, 2020-2023 |Méso|Star> (contact@meso-star.com)
  * Copyright (C) 2018 CNRS
  * Copyright (C) 2018 Université Paul Sabatier (contact-edstar@laplace.univ-tlse.fr)
  *
diff --git a/src/test_htcp_utils.h b/src/test_htcp_utils.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2018, 2020-2022 |Méso|Star> (contact@meso-star.com)
+/* Copyright (C) 2018, 2020-2023 |Méso|Star> (contact@meso-star.com)
  * Copyright (C) 2018 CNRS
  * Copyright (C) 2018 Université Paul Sabatier (contact-edstar@laplace.univ-tlse.fr)
  *