commit d14c236670e0bea2f34bde13094c220b534ef749
parent 119366402628a2dac4bd4fc2d1c7022be323fd9e
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Mon, 4 May 2020 11:07:42 +0200
Merge branch 'release_0.0.2'
Diffstat:
12 files changed, 34 insertions(+), 20 deletions(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -1,4 +1,5 @@
-# Copyright (C) 2018 CNRS, |Meso|Star>, Université Paul Sabatier
+# Copyright (C) 2018, 2020 |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
# it under the terms of the GNU General Public License as published by
diff --git a/cmake/doc/CMakeLists.txt b/cmake/doc/CMakeLists.txt
@@ -1,4 +1,5 @@
-# Copyright (C) 2018 CNRS, |Meso|Star>, Université Paul Sabatier
+# Copyright (C) 2018, 2020 |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
# it under the terms of the GNU General Public License as published by
diff --git a/cmake/htcp/CMakeLists.txt b/cmake/htcp/CMakeLists.txt
@@ -1,4 +1,5 @@
-# Copyright (C) 2018 CNRS, |Meso|Star>, Université Paul Sabatier
+# Copyright (C) 2018, 2020 |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
# it under the terms of the GNU General Public License as published by
@@ -21,7 +22,7 @@ project(htcp-library C)
################################################################################
set(VERSION_MAJOR 0)
set(VERSION_MINOR 0)
-set(VERSION_PATCH 1)
+set(VERSION_PATCH 2)
set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
set(HTCP_FILES_SRC htcp.c)
diff --git a/cmake/les2htcp/CMakeLists.txt b/cmake/les2htcp/CMakeLists.txt
@@ -1,4 +1,5 @@
-# Copyright (C) 2018 CNRS, |Meso|Star>, Université Paul Sabatier
+# Copyright (C) 2018, 2020 |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
# it under the terms of the GNU General Public License as published by
@@ -36,7 +37,7 @@ include_directories(
################################################################################
set(VERSION_MAJOR 0)
set(VERSION_MINOR 0)
-set(VERSION_PATCH 1)
+set(VERSION_PATCH 2)
set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
configure_file(${HTCP_SOURCE_DIR}/les2htcp.h.in
diff --git a/doc/les2htcp.1.txt b/doc/les2htcp.1.txt
@@ -1,4 +1,5 @@
-// Copyright (C) 2018 CNRS, |Meso|Star>, Université Paul Sabatier
+// Copyright (C) 2018, 2020 |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
// it under the terms of the GNU General Public License as published by
@@ -46,11 +47,11 @@ file [1]. Expected variables in the submitted NetCDF file are:
West-East and South-North axis. The unit is assumed to be the meter but it
can be adjusted by the *-m* option.
-* _RVT_: water vapor mixing ratio in each grid cell; in kg of water per m^3 of
+* _RVT_: water vapor mixing ratio in each grid cell; in kg of water per kg of
dry air.
* _RCT_: liquid vapor (in suspension) mixing ratio in each grid cell; in kg of
- water per m^3 of dry air.
+ water per kg of dry air.
* _PABST_: pressure in each grid cell in Pascal.
@@ -121,8 +122,9 @@ NOTES
COPYRIGHT
---------
+Copyright © 2018, 2020 |Meso|Star> <contact@meso-star.com>.
Copyright © 2018 CNRS, Université Paul Sabatier
-<contact-edstar@laplace.univ-tlse.fr>, |Meso|Star> <contact@meso-star.com>.
+<contact-edstar@laplace.univ-tlse.fr>.
*les2htcp* is free software released under the GPLv3+ license: GNU GPL version
3 or later <https://gnu.org/licenses/gpl.html>. You are free to change and
redistribute it. There is NO WARRANTY, to the extent permitted by law.
diff --git a/src/htcp.c b/src/htcp.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2018 CNRS, |Meso|Star>, Université Paul Sabatier
+/* Copyright (C) 2018, 2020 |Meso|Star> (contact@meso-star.com)
+ * Copyright (C) CNRS, 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/htcp.h b/src/htcp.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2018 CNRS, |Meso|Star>, Université Paul Sabatier
+/* Copyright (C) 2018, 2020 |Meso|Star> (contact@meso-star.com)
+ * Copyright (C) CNRS, 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/les2htcp.c b/src/les2htcp.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2018 CNRS, |Meso|Star>, Université Paul Sabatier
+/* Copyright (C) 2018, 2020 |Meso|Star> (contact@meso-star.com)
+ * Copyright (C) CNRS, 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
@@ -80,9 +81,10 @@ print_help(const char* cmd)
" -v display version information and exit.\n");
printf("\n");
printf(
-"les2htcp (C) 2018 CNRS, |Meso|Star>, Université Paul Sabatier. This is free\n"
-"software released under the GNU GPL license, version 3 or later. You are free\n"
-"to change or redistribute it under certain conditions\n"
+"Copyright (C) 2018, 2020 |Meso|Star> (contact@meso-star.com).\n"
+"Copyright (C) 2018 CNRS, Université Paul Sabatier. les2htcp is free software\n"
+"released under the GNU GPL license, version 3 or later. You are free to\n"
+"change or redistribute it under certain conditions\n"
"<http://gnu.org/licenses/gpl.html>\n");
}
diff --git a/src/test_htcp.c b/src/test_htcp.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2018 CNRS, |Meso|Star>, Université Paul Sabatier
+/* Copyright (C) 2018, 2020 |Meso|Star> (contact@meso-star.com)
+ * Copyright (C) CNRS, 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_htcp_load.c b/src/test_htcp_load.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2018 CNRS, |Meso|Star>, Université Paul Sabatier
+/* Copyright (C) 2018, 2020 |Meso|Star> (contact@meso-star.com)
+ * Copyright (C) CNRS, 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_htcp_load_from_file.c b/src/test_htcp_load_from_file.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2018 CNRS, |Meso|Star>, Université Paul Sabatier
+/* Copyright (C) 2018, 2020 |Meso|Star> (contact@meso-star.com)
+ * Copyright (C) CNRS, 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_htcp_utils.h b/src/test_htcp_utils.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2018 CNRS, |Meso|Star>, Université Paul Sabatier
+/* Copyright (C) 2018, 2020 |Meso|Star> (contact@meso-star.com)
+ * Copyright (C) CNRS, 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
