htmie

Optical properties of water droplets
git clone git://git.meso-star.fr/htmie.git
Log | Files | Refs | README | LICENSE

commit a57cc825b28850ea997e437e1a317b19b603ebd6
parent 72cb14873bafe9c2ab07b965cf13eaccbb191660
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Mon,  9 Jan 2023 12:09:21 +0100

Merge branch 'release_0.0.4' into develop

Diffstat:
MREADME.md | 23++++++++++++++++++++++-
Mcmake/CMakeLists.txt | 7++++---
Mdoc/htmie.5.scd | 5+++--
Msrc/dump_netcdf_data.sh | 16++++++++--------
Msrc/htmie.c | 5+++--
Msrc/htmie.h | 5+++--
Msrc/test_htmie.c | 5+++--
Msrc/test_htmie_load.c | 5+++--
Msrc/test_htmie_utils.h | 5+++--
9 files changed, 52 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md @@ -20,9 +20,30 @@ 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. + +### Version 0.0.3 + +Sets the CMake minimum version to 3.1: since CMake 3.20, version 2.8 has become +obsolete. + +### Version 0.0.2 + +Fix compilation warnings when using the NetCDF library in version 4.4.0. + +### Version 0.0.1 + +- Fix compilation errors when using the NetCDF library in version 4.4.0. +- Minor correction of linear interpolation: the interpolation parameter was not + correctly truncated between [0,1] in order to handle numerical inaccuracy. + ## Copyright -Copyright (C) 2018, 2020-2022 [|Meso|Star](http://www.meso-star.com) (<contact@meso-star.com>) +Copyright (C) 2018, 2020-2023 [|Méso|Star](http://www.meso-star.com) (<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,5 +1,6 @@ -# Copyright (C) 2018, 2020-2022 |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 @@ -52,7 +53,7 @@ endif() ################################################################################ set(VERSION_MAJOR 0) set(VERSION_MINOR 0) -set(VERSION_PATCH 3) +set(VERSION_PATCH 4) set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}) set(HTMIE_FILES_SRC htmie.c) diff --git a/doc/htmie.5.scd b/doc/htmie.5.scd @@ -1,7 +1,8 @@ htmie(5) -; Copyright (C) 2018, 2020-2022 |Méso|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 diff --git a/src/dump_netcdf_data.sh b/src/dump_netcdf_data.sh @@ -1,6 +1,8 @@ -#!/bin/bash +#!/bin/sh -e -# Copyright (C) 2018 |Meso|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 # # 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 @@ -14,26 +16,24 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. */ -set -e -set -o pipefail if [ $# -lt 2 ]; then echo "Usage: $0 VAR-NAME MIE-NETCDF " exit 0 fi -if [ ! -f $2 ]; then +if [ ! -f "$2" ]; then echo "\"$2\" is not a valid file." exit 0 fi -name=$(basename $2) +name=${2##*/} name=${name%.*} -ncdump -v $1 $2 \ +ncdump -v "$1" "$2" \ | sed -n "/^ *$1 *=/,\$p" \ | sed "s/^ *$1 *= *//g" \ | sed 's/[;} ]//g' \ | sed 's/,/\n/g' \ - | sed '/^ *$/d' > ${name}_${1} + | sed '/^ *$/d' > "${name}_${1}" diff --git a/src/htmie.c b/src/htmie.c @@ -1,5 +1,6 @@ -/* Copyright (C) 2018, 2020-2022 |Méso|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 diff --git a/src/htmie.h b/src/htmie.h @@ -1,5 +1,6 @@ -/* Copyright (C) 2018, 2020-2022 |Méso|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 diff --git a/src/test_htmie.c b/src/test_htmie.c @@ -1,5 +1,6 @@ -/* Copyright (C) 2018, 2020-2022 |Méso|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 diff --git a/src/test_htmie_load.c b/src/test_htmie_load.c @@ -1,5 +1,6 @@ -/* Copyright (C) 2018, 2020-2022 |Méso|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 diff --git a/src/test_htmie_utils.h b/src/test_htmie_utils.h @@ -1,5 +1,6 @@ -/* Copyright (C) 2018, 2020-2022 |Méso|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