From 8c43f306c936c76e0d3d6d3f6f9231b16caaf20a Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Wed, 13 Dec 2023 13:23:23 +0100
Subject: [PATCH] Philippe 13/12/2023: update I/O libraries (HDF5, netCDF and
libaec)
---
src/LIB/hdf5-1.14.0.tar.gz | 3 ---
src/LIB/hdf5-1.14.3.tar.gz | 3 +++
src/LIB/libaec-1.1.2.tar.gz | 3 +++
src/LIB/libaec-v1.0.6.tar.gz | 3 ---
src/LIB/netcdf-c-4.9.0.tar.gz | 3 ---
src/LIB/netcdf-c-4.9.2.tar.gz | 3 +++
src/LIB/netcdf-fortran-4.6.0.tar.gz | 3 ---
src/LIB/netcdf-fortran-4.6.1.tar.gz | 3 +++
src/Makefile | 2 +-
src/configure | 8 ++++----
10 files changed, 17 insertions(+), 17 deletions(-)
delete mode 100644 src/LIB/hdf5-1.14.0.tar.gz
create mode 100644 src/LIB/hdf5-1.14.3.tar.gz
create mode 100644 src/LIB/libaec-1.1.2.tar.gz
delete mode 100644 src/LIB/libaec-v1.0.6.tar.gz
delete mode 100644 src/LIB/netcdf-c-4.9.0.tar.gz
create mode 100644 src/LIB/netcdf-c-4.9.2.tar.gz
delete mode 100644 src/LIB/netcdf-fortran-4.6.0.tar.gz
create mode 100644 src/LIB/netcdf-fortran-4.6.1.tar.gz
diff --git a/src/LIB/hdf5-1.14.0.tar.gz b/src/LIB/hdf5-1.14.0.tar.gz
deleted file mode 100644
index 14467a663..000000000
--- a/src/LIB/hdf5-1.14.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a571cc83efda62e1a51a0a912dd916d01895801c5025af91669484a1575a6ef4
-size 19285771
diff --git a/src/LIB/hdf5-1.14.3.tar.gz b/src/LIB/hdf5-1.14.3.tar.gz
new file mode 100644
index 000000000..dfac85d5a
--- /dev/null
+++ b/src/LIB/hdf5-1.14.3.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:09cdb287aa7a89148c1638dd20891fdbae08102cf433ef128fd345338aa237c7
+size 19969199
diff --git a/src/LIB/libaec-1.1.2.tar.gz b/src/LIB/libaec-1.1.2.tar.gz
new file mode 100644
index 000000000..03a033ad9
--- /dev/null
+++ b/src/LIB/libaec-1.1.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a5d03a242468014b92b1b196de397f1e9a7927782db1a0423ea01db78421e373
+size 3138136
diff --git a/src/LIB/libaec-v1.0.6.tar.gz b/src/LIB/libaec-v1.0.6.tar.gz
deleted file mode 100644
index 79f282671..000000000
--- a/src/LIB/libaec-v1.0.6.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c5409f7903dd84e75fb48d8d5e603b2a06e82737a23ac86297bedd6218c20d43
-size 3629633
diff --git a/src/LIB/netcdf-c-4.9.0.tar.gz b/src/LIB/netcdf-c-4.9.0.tar.gz
deleted file mode 100644
index 6ee47e081..000000000
--- a/src/LIB/netcdf-c-4.9.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4c956022b79c08e5e14eee8df51b13c28e6121c2b7e7faadc21b375949400b49
-size 7103958
diff --git a/src/LIB/netcdf-c-4.9.2.tar.gz b/src/LIB/netcdf-c-4.9.2.tar.gz
new file mode 100644
index 000000000..7d35658a6
--- /dev/null
+++ b/src/LIB/netcdf-c-4.9.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cf11babbbdb9963f09f55079e0b019f6d0371f52f8e1264a5ba8e9fdab1a6c48
+size 7142536
diff --git a/src/LIB/netcdf-fortran-4.6.0.tar.gz b/src/LIB/netcdf-fortran-4.6.0.tar.gz
deleted file mode 100644
index acc4addf3..000000000
--- a/src/LIB/netcdf-fortran-4.6.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:198bff6534cc85a121adc9e12f1c4bc53406c403bda331775a1291509e7b2f23
-size 1110214
diff --git a/src/LIB/netcdf-fortran-4.6.1.tar.gz b/src/LIB/netcdf-fortran-4.6.1.tar.gz
new file mode 100644
index 000000000..022946e1c
--- /dev/null
+++ b/src/LIB/netcdf-fortran-4.6.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b50b0c72b8b16b140201a020936aa8aeda5c79cf265c55160986cd637807a37a
+size 1112270
diff --git a/src/Makefile b/src/Makefile
index b13e1975e..d903b69fd 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -352,7 +352,7 @@ $(CDF_MOD) :
cd ${DIR_HDF} && ./configure --enable-fortran --disable-shared --prefix=${CDF_PATH} --libdir=${CDF_PATH}/lib64 --with-szlib=${CDF_PATH}/include,${CDF_PATH}/lib64 \
CC="$(CC)" CFLAGS="$(HDF_OPT)" ${HDF_CONF} FC="$(FC)" FCFLAGS="$(NETCDF_OPT)" LDFLAGS="-L${CDF_PATH}/lib64" LIBS="-lsz -laec -lz" && \
$(MAKE) && $(MAKE) install && $(MAKE) clean
- cd ${DIR_CDFC} && ./configure --disable-shared --prefix=${CDF_PATH} --libdir=${CDF_PATH}/lib64 --disable-dap \
+ cd ${DIR_CDFC} && ./configure --disable-shared --prefix=${CDF_PATH} --libdir=${CDF_PATH}/lib64 --disable-dap --disable-byterange \
CC="$(CC)" CFLAGS="$(NETCDF_OPT)" CPPFLAGS="${INC_NETCDF}" ${CDF_CONF} LDFLAGS="-L${CDF_PATH}/lib64" LIBS="-lhdf5_hl -lhdf5 -lsz -laec -lz -ldl " && \
$(MAKE) && $(MAKE) install && $(MAKE) clean
ifdef MNH_FOREFIRE
diff --git a/src/configure b/src/configure
index 1c765c182..a00c19887 100755
--- a/src/configure
+++ b/src/configure
@@ -12,11 +12,11 @@ export VERSION_MASTER=${VERSION_MASTER:-MNH-V5-6}
export VERSION_BUG=${VERSION_BUG:-2}
export VERSION_XYZ=${VERSION_XYZ:-${VERSION_MASTER}-${VERSION_BUG}${VER_OASIS:+-${VER_OASIS}}}
export VERSION_DATE=${VERSION_DATE:-"28/11/2023"}
-export VERSION_LIBAEC=${VERSION_LIBAEC:-"v1.0.6"}
-export VERSION_HDF=${VERSION_HDF:-"1.14.0"}
-export VERSION_CDFC=${VERSION_CDFC:-"4.9.0"}
+export VERSION_LIBAEC=${VERSION_LIBAEC:-"1.1.2"}
+export VERSION_HDF=${VERSION_HDF:-"1.14.3"}
+export VERSION_CDFC=${VERSION_CDFC:-"4.9.2"}
export VERSION_CDFCXX=${VERSION_CDFCXX:-"4.3.1"}
-export VERSION_CDFF=${VERSION_CDFF:-"4.6.0"}
+export VERSION_CDFF=${VERSION_CDFF:-"4.6.1"}
export VERSION_GRIBAPI=${VERSION_GRIBAPI:-"1.26.0-Source"}
export VERSION_ECCODES=${VERSION_ECCODES:-"2.18.0"}
export ECCODES_DEFINITION_PATH=${ECCODES_DEFINITION_PATH:-${SRC_MESONH}/src/LIB/eccodes-${VERSION_ECCODES}/definitions/}
--
GitLab