Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Latest Libraries - 2022-Nov-04 #71

Merged
merged 13 commits into from
Nov 4, 2022
17 changes: 16 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -19,7 +35,6 @@
- Renamed tarfile GitHub Action for consistency
- Remove HDF4 from the essential libraries


## [7.5.0] - 2022-07-01

### Updates
Expand Down
10 changes: 5 additions & 5 deletions GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand All @@ -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 |
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.5.1
7.6.0
2 changes: 1 addition & 1 deletion curl
Submodule curl updated 2106 files
2 changes: 1 addition & 1 deletion esmf
Submodule esmf updated 352 files
2 changes: 1 addition & 1 deletion nco
Submodule nco updated 113 files
2 changes: 1 addition & 1 deletion netcdf
Submodule netcdf updated 630 files
2 changes: 1 addition & 1 deletion netcdf-fortran
Submodule netcdf-fortran updated 143 files
2 changes: 1 addition & 1 deletion scripts/cdo.sha512
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7aaa8b7c536085f4e4a328a6f49891e00a4662357cd2923cf331c4ae61bb7fb2691d8740dbd75384f1e2d41a3660f79a1122ff2983a7c0c373d6a63a3af9e2c8 cdo-2.0.5.tar.gz
d7fcbc013be9398ac90b32723e4f88eeaa4f88a006c6fd0969ceec23b8aeb4f6314f92f9cca15dea5747337d8446ce372dedddcbaaf00ad28407626728e586d8 cdo-2.1.0.tar.gz
4 changes: 2 additions & 2 deletions scripts/download_cdo.bash
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion zlib
Submodule zlib updated 133 files