From 5aaf23e2b88d5d072bbd0c5e1bd246da14f0fc70 Mon Sep 17 00:00:00 2001 From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr> Date: Wed, 24 Jun 2020 11:24:50 +0200 Subject: [PATCH] Philippe 24/06/2020: upgrade netCDF, HDF5 and libaec libraries (cherry picked from commit 0f6a75e7f11ecba18eb654d72a83b1be8c992a48) --- src/LIB/hdf5-1.12.0.tar.gz | 3 +++ src/LIB/hdf5-1.8.20.tar.gz | 3 --- src/LIB/libaec-0.3.2.tar.gz | 3 --- src/LIB/libaec-0.3.4.tar.gz | 3 +++ src/LIB/netcdf-4.5.0.tar.gz | 3 --- src/LIB/netcdf-c-4.7.4.tar.gz | 3 +++ src/LIB/netcdf-cxx-4.2.tar.gz | 3 --- src/LIB/netcdf-cxx4-4.3.1.tar.gz | 3 +++ src/LIB/netcdf-fortran-4.4.4.tar.gz | 3 --- src/LIB/netcdf-fortran-4.5.3.tar.gz | 3 +++ src/Makefile.MESONH.mk | 4 ++-- src/configure | 14 +++++++------- 12 files changed, 24 insertions(+), 24 deletions(-) create mode 100644 src/LIB/hdf5-1.12.0.tar.gz delete mode 100644 src/LIB/hdf5-1.8.20.tar.gz delete mode 100644 src/LIB/libaec-0.3.2.tar.gz create mode 100644 src/LIB/libaec-0.3.4.tar.gz delete mode 100644 src/LIB/netcdf-4.5.0.tar.gz create mode 100644 src/LIB/netcdf-c-4.7.4.tar.gz delete mode 100644 src/LIB/netcdf-cxx-4.2.tar.gz create mode 100644 src/LIB/netcdf-cxx4-4.3.1.tar.gz delete mode 100644 src/LIB/netcdf-fortran-4.4.4.tar.gz create mode 100644 src/LIB/netcdf-fortran-4.5.3.tar.gz diff --git a/src/LIB/hdf5-1.12.0.tar.gz b/src/LIB/hdf5-1.12.0.tar.gz new file mode 100644 index 000000000..b61a243e0 --- /dev/null +++ b/src/LIB/hdf5-1.12.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a62dcb276658cb78e6795dd29bf926ed7a9bc4edf6e77025cd2c689a8f97c17a +size 12580850 diff --git a/src/LIB/hdf5-1.8.20.tar.gz b/src/LIB/hdf5-1.8.20.tar.gz deleted file mode 100644 index 447023d0e..000000000 --- a/src/LIB/hdf5-1.8.20.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6ed660ccd2bc45aa808ea72e08f33cc64009e9dd4e3a372b53438b210312e8d9 -size 12475267 diff --git a/src/LIB/libaec-0.3.2.tar.gz b/src/LIB/libaec-0.3.2.tar.gz deleted file mode 100644 index 3db97620e..000000000 --- a/src/LIB/libaec-0.3.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:acb7cbf4e8f3c63a9ea1af1e1a2d0c9658f4831deb7327f110bdd5c187dc3441 -size 353185 diff --git a/src/LIB/libaec-0.3.4.tar.gz b/src/LIB/libaec-0.3.4.tar.gz new file mode 100644 index 000000000..f35f3df1a --- /dev/null +++ b/src/LIB/libaec-0.3.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:62af371b50b9ee93fa1d0d038809f3b1ab4dc4b75c182982fcdcd90c1847666b +size 1495364 diff --git a/src/LIB/netcdf-4.5.0.tar.gz b/src/LIB/netcdf-4.5.0.tar.gz deleted file mode 100644 index 0a4c4e97f..000000000 --- a/src/LIB/netcdf-4.5.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cbe70049cf1643c4ad7453f86510811436c9580cb7a1684ada2f32b95b00ca79 -size 5494644 diff --git a/src/LIB/netcdf-c-4.7.4.tar.gz b/src/LIB/netcdf-c-4.7.4.tar.gz new file mode 100644 index 000000000..e0062fbd7 --- /dev/null +++ b/src/LIB/netcdf-c-4.7.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:99930ad7b3c4c1a8e8831fb061cb02b2170fc8e5ccaeda733bd99c3b9d31666b +size 19711158 diff --git a/src/LIB/netcdf-cxx-4.2.tar.gz b/src/LIB/netcdf-cxx-4.2.tar.gz deleted file mode 100644 index 11c1c1553..000000000 --- a/src/LIB/netcdf-cxx-4.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:95ed6ab49a0ee001255eac4e44aacb5ca4ea96ba850c08337a3e4c9a0872ccd1 -size 703482 diff --git a/src/LIB/netcdf-cxx4-4.3.1.tar.gz b/src/LIB/netcdf-cxx4-4.3.1.tar.gz new file mode 100644 index 000000000..900c4c472 --- /dev/null +++ b/src/LIB/netcdf-cxx4-4.3.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6a1189a181eed043b5859e15d5c080c30d0e107406fbb212c8fb9814e90f3445 +size 598335 diff --git a/src/LIB/netcdf-fortran-4.4.4.tar.gz b/src/LIB/netcdf-fortran-4.4.4.tar.gz deleted file mode 100644 index 9be947375..000000000 --- a/src/LIB/netcdf-fortran-4.4.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b2d395175f8d283e68c8be516e231a96b191ade67ad0caafaf7fa01b1e6b5d75 -size 1025980 diff --git a/src/LIB/netcdf-fortran-4.5.3.tar.gz b/src/LIB/netcdf-fortran-4.5.3.tar.gz new file mode 100644 index 000000000..8533eec91 --- /dev/null +++ b/src/LIB/netcdf-fortran-4.5.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c6da30c2fe7e4e614c1dff4124e857afbd45355c6798353eccfa60c0702b495a +size 1805683 diff --git a/src/Makefile.MESONH.mk b/src/Makefile.MESONH.mk index 29b763275..53ed3852d 100644 --- a/src/Makefile.MESONH.mk +++ b/src/Makefile.MESONH.mk @@ -487,8 +487,8 @@ endif # # ifeq "$(VER_CDF)" "CDFAUTO" -DIR_CDFC?=${SRC_MESONH}/src/LIB/netcdf-${VERSION_CDFC} -DIR_CDFCXX?=${SRC_MESONH}/src/LIB/netcdf-cxx-${VERSION_CDFCXX} +DIR_CDFC?=${SRC_MESONH}/src/LIB/netcdf-c-${VERSION_CDFC} +DIR_CDFCXX?=${SRC_MESONH}/src/LIB/netcdf-cxx4-${VERSION_CDFCXX} DIR_CDFF?=${SRC_MESONH}/src/LIB/netcdf-fortran-${VERSION_CDFF} CDF_PATH?=${SRC_MESONH}/src/LIB/netcdf-${ARCH}-R${MNH_REAL}I${MNH_INT} CDF_MOD?=${CDF_PATH}/include/netcdf.mod diff --git a/src/configure b/src/configure index 9a6a4f7a2..25a23d27e 100755 --- a/src/configure +++ b/src/configure @@ -12,11 +12,11 @@ export VERSION_MASTER=${VERSION_MASTER:-MNH-V5-4} export VERSION_BUG=${VERSION_BUG:-3} export VERSION_XYZ=${VERSION_XYZ:-${VERSION_MASTER}-${VERSION_BUG}${VER_OASIS:+-${VER_OASIS}}} export VERSION_DATE=${VERSION_DATE:-"06/03/2020"} -export VERSION_LIBAEC=${VERSION_LIBAEC:-"0.3.2"} -export VERSION_HDF=${VERSION_HDF:-"1.8.20"} -export VERSION_CDFC=${VERSION_CDFC:-"4.5.0"} -export VERSION_CDFCXX=${VERSION_CDFCXX:-"4.2"} -export VERSION_CDFF=${VERSION_CDFF:-"4.4.4"} +export VERSION_LIBAEC=${VERSION_LIBAEC:-"0.3.4"} +export VERSION_HDF=${VERSION_HDF:-"1.12.0"} +export VERSION_CDFC=${VERSION_CDFC:-"4.7.4"} +export VERSION_CDFCXX=${VERSION_CDFCXX:-"4.3.1"} +export VERSION_CDFF=${VERSION_CDFF:-"4.5.3"} export VERSION_GRIBAPI=${VERSION_GRIBAPI:-"1.26.0-Source"} export MNH_INT=${MNH_INT:-"4"} export LFI_INT=${LFI_INT:-8} @@ -512,8 +512,8 @@ fi if [ "x${VER_CDF}" == "xCDFAUTO" ] ;then ( cd $LOCAL/src/LIB ; [ ! -d libaec-${VERSION_LIBAEC} ] && tar xvfz libaec-${VERSION_LIBAEC}.tar.gz ) ( cd $LOCAL/src/LIB ; [ ! -d hdf5-${VERSION_HDF} ] && tar xvfz hdf5-${VERSION_HDF}.tar.gz ) -( cd $LOCAL/src/LIB ; [ ! -d netcdf-${VERSION_CDFC} ] && tar xvfz netcdf-${VERSION_CDFC}.tar.gz ) -( cd $LOCAL/src/LIB ; [ ! -d netcdf-cxx-${VERSION_CDFCXX} ] && tar xvfz netcdf-cxx-${VERSION_CDFCXX}.tar.gz ) +( cd $LOCAL/src/LIB ; [ ! -d netcdf-${VERSION_CDFC} ] && tar xvfz netcdf-c-${VERSION_CDFC}.tar.gz ) +( cd $LOCAL/src/LIB ; [ ! -d netcdf-cxx-${VERSION_CDFCXX} ] && tar xvfz netcdf-cxx4-${VERSION_CDFCXX}.tar.gz ) ( cd $LOCAL/src/LIB ; [ ! -d netcdf-fortran-${VERSION_CDFF} ] && tar xvfz netcdf-fortran-${VERSION_CDFF}.tar.gz ) fi # -- GitLab