diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d28c4a..a2546d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,22 @@ ### Removed ### Added +## [7.6.0] - 2022-11-04 + +### Updates + +- ESMF v8.4.0 +- zlib 1.2.13 +- curl 7.86.0 +- netCDF-C 4.9.0 +- netCDF-Fortran 4.6.0 +- NCO 5.1.1 +- CDO 2.1.0 + +### Fixed + +- CDO 2.1.0 requires `-std=c++17` to build with clang + ## [7.5.1] - 2022-08-22 ### Fixed @@ -19,7 +35,6 @@ - Renamed tarfile GitHub Action for consistency - Remove HDF4 from the essential libraries - ## [7.5.0] - 2022-07-01 ### Updates diff --git a/GNUmakefile b/GNUmakefile index 6c3ddec..9798065 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -180,8 +180,8 @@ RELEASE_FILE = $(MKFILE_DIRNAME)-$(DATE) export MMACOS_MIN # There is an issue with clang++ and cdo - CLANG_STDC14 := -std=c++14 - export CLANG_STDC14 + CLANG_STDC17 := -std=c++17 + export CLANG_STDC17 endif endif @@ -612,7 +612,7 @@ nco.config : nco/configure export CPPFLAGS="$(CPPFLAGS) $(INC_SUPP) -I$(prefix)/include/netcdf";\ export CXXFLAGS="$(NCO_CXXFLAGS)";\ export CFLAGS="$(CFLAGS) $(PTHREAD_FLAG)";\ - export LIBS="-L$(prefix)/lib $(LIB_HDF5) $(LIB_HDF4) -lsz -ljpeg $(LINK_GPFS) $(LIB_CURL) -ldl -lm $(LIB_EXTRA)" ;\ + export LIBS="-L$(prefix)/lib $(LIB_NETCDF) $(LIB_HDF5) $(LIB_HDF4) -lsz -ljpeg $(LINK_GPFS) $(LIB_CURL) -ldl -lm $(LIB_EXTRA)" ;\ ./configure --prefix=$(prefix) \ --includedir=$(prefix)/include/nco \ --enable-ncoxx \ @@ -696,7 +696,7 @@ cdo.config: cdo.download cdo/configure netcdf.install udunits2.install --with-udunits2=$(prefix) \ --disable-grib --disable-openmp \ --disable-shared --enable-static \ - CXXFLAGS="$(CLANG_STDC14)" FCFLAGS="$(NAG_FCFLAGS)" CC=$(NC_CC) FC=$(NC_FC) CXX=$(NC_CXX) F77=$(NC_F77) ) + CXXFLAGS="$(CLANG_STDC17)" FCFLAGS="$(NAG_FCFLAGS)" CC=$(NC_CC) FC=$(NC_FC) CXX=$(NC_CXX) F77=$(NC_F77) ) @touch $@ nccmp.config: nccmp/configure netcdf.install @@ -955,7 +955,7 @@ nco.install: nco.config export NETCDF_INC="$(prefix)/include/netcdf"; \ export PATH="$(prefix)/bin:$(PATH)" ;\ export CPPFLAGS="$(CPPFLAGS) $(INC_SUPP) -I$(prefix)/include/netcdf";\ - export LIBS="-L$(prefix)/lib $(LIB_HDF5) $(LIB_HDF4) -lsz -ljpeg $(LINK_GPFS) $(LIB_CURL) -ldl -lm" ;\ + export LIBS="-L$(prefix)/lib $(LIB_NETCDF) $(LIB_HDF5) $(LIB_HDF4) -lsz -ljpeg $(LINK_GPFS) $(LIB_CURL) -ldl -lm" ;\ $(MAKE) install CC=$(NC_CC) FC=$(NC_FC) CXX=$(NC_CXX) F77=$(NC_F77) ) @touch $@ endif diff --git a/README.md b/README.md index d2336cc..028151f 100644 --- a/README.md +++ b/README.md @@ -12,9 +12,9 @@ NASA/GSFC. | Library | Version | | --- | --- | -| [ESMF](https://www.earthsystemcog.org/projects/esmf/) | v8.3.0 | -| [netCDF](https://github.com/Unidata/netcdf-c) | 4.8.1 | -| [netCDF Fortran](https://github.com/Unidata/netcdf-fortran) | 4.5.4 | +| [ESMF](https://www.earthsystemcog.org/projects/esmf/) | v8.4.0 | +| [netCDF](https://github.com/Unidata/netcdf-c) | 4.9.0 | +| [netCDF Fortran](https://github.com/Unidata/netcdf-fortran) | 4.6.0 | | [netCDF C++](https://github.com/Unidata/netcdf-cxx4) | 4.3.1 | | [HDF5](https://portal.hdfgroup.org/display/support) | 1.10.9 | | [HDF4](https://portal.hdfgroup.org/display/support) | 4.2.15 | @@ -23,12 +23,12 @@ NASA/GSFC. | [antlr2](https://www.antlr2.org/) | 2.7.7 | | [GSL](https://www.gnu.org/software/gsl/) | 2.7 | | [jpeg](http://www.ijg.org/) | 9e | -| [zlib](http://www.zlib.net/) | 1.2.11 | +| [zlib](http://www.zlib.net/) | 1.2.13 | | [szip](https://support.hdfgroup.org/doc_resource/SZIP/) | 2.1.1 | -| [cURL](https://curl.haxx.se/) | 7.83.1 | +| [cURL](https://curl.haxx.se/) | 7.86.0 | | [UDUNITS2](https://github.com/Unidata/UDUNITS-2) | 2.2.26 | -| [NCO](http://nco.sourceforge.net/) | 5.0.7 | -| [CDO](https://code.mpimet.mpg.de/projects/cdo) | 2.0.5 | +| [NCO](http://nco.sourceforge.net/) | 5.1.1 | +| [CDO](https://code.mpimet.mpg.de/projects/cdo) | 2.1.0 | | [nccmp](https://gitlab.com/remikz/nccmp) | 1.9.1.0 | | [FLAP](https://github.com/mathomp4/FLAP) | geos/v1.10.0 | | [HDF-EOS2](https://wiki.earthdata.nasa.gov/display/DAS) | 3.0 | diff --git a/VERSION b/VERSION index a5f017a..93c8dda 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.5.1 +7.6.0 diff --git a/curl b/curl index 462196e..cd95ee9 160000 --- a/curl +++ b/curl @@ -1 +1 @@ -Subproject commit 462196e6b4a47f924293a0e26b8e9c23d37ac26f +Subproject commit cd95ee9f771361acf241629d2fe5507e308082a2 diff --git a/esmf b/esmf index 8fad5b5..9935617 160000 --- a/esmf +++ b/esmf @@ -1 +1 @@ -Subproject commit 8fad5b5bbd4bb5765fb7c69492806de0fd4e7236 +Subproject commit 99356176e374c49273893bbb9564705915dba621 diff --git a/nco b/nco index aa843e6..106f7c5 160000 --- a/nco +++ b/nco @@ -1 +1 @@ -Subproject commit aa843e6bd190452eb949c91916c32f5a8c4f6d1a +Subproject commit 106f7c5273dae48638585166169136ed08ee9e70 diff --git a/netcdf b/netcdf index cd6173f..d56c504 160000 --- a/netcdf +++ b/netcdf @@ -1 +1 @@ -Subproject commit cd6173f472b778fa0e558982c59f7183aa5b8e47 +Subproject commit d56c50491692659e3769750d44398ddd9c84d05e diff --git a/netcdf-fortran b/netcdf-fortran index 7ce542e..f722fc0 160000 --- a/netcdf-fortran +++ b/netcdf-fortran @@ -1 +1 @@ -Subproject commit 7ce542ee6619efdb5323b0a3e57c75ce606f845e +Subproject commit f722fc0c7f1091098a575beb2c2e5dbb23ffb644 diff --git a/scripts/cdo.sha512 b/scripts/cdo.sha512 index 5a046e6..cfc5f0c 100644 --- a/scripts/cdo.sha512 +++ b/scripts/cdo.sha512 @@ -1 +1 @@ -7aaa8b7c536085f4e4a328a6f49891e00a4662357cd2923cf331c4ae61bb7fb2691d8740dbd75384f1e2d41a3660f79a1122ff2983a7c0c373d6a63a3af9e2c8 cdo-2.0.5.tar.gz +d7fcbc013be9398ac90b32723e4f88eeaa4f88a006c6fd0969ceec23b8aeb4f6314f92f9cca15dea5747337d8446ce372dedddcbaaf00ad28407626728e586d8 cdo-2.1.0.tar.gz diff --git a/scripts/download_cdo.bash b/scripts/download_cdo.bash index d21601c..f1c1ead 100755 --- a/scripts/download_cdo.bash +++ b/scripts/download_cdo.bash @@ -5,9 +5,9 @@ # -------------- package_name='cdo' -tarball='cdo-2.0.5.tar.gz' +tarball='cdo-2.1.0.tar.gz' # NOTE NOTE The last node of this URL changes with each new version -base_url='https://code.mpimet.mpg.de/attachments/download/26823/' +base_url='https://code.mpimet.mpg.de/attachments/download/27481/' export LMOD_SH_DBG_ON=0 diff --git a/zlib b/zlib index cacf7f1..04f42ce 160000 --- a/zlib +++ b/zlib @@ -1 +1 @@ -Subproject commit cacf7f1d4e3d44d871b605da3b647f07d718623f +Subproject commit 04f42ceca40f73e2978b50e93806c2a18c1281fc