GEOS-ESM · mathomp4 · Apr 23, 2024 · Apr 22, 2024 · Apr 22, 2024 · Apr 22, 2024
@@ -31,9 +31,6 @@
 [submodule "hdf4"]
 	path = hdf4
 	url = https://github.com/HDFGroup/hdf4.git
-[submodule "FLAP"]
-	path = FLAP
-	url = https://github.com/mathomp4/FLAP.git
 [submodule "esmf"]
 	path = esmf
 	url = https://github.com/esmf-org/esmf.git
@@ -46,6 +43,3 @@
 [submodule "xgboost"]
 	path = xgboost
 	url = https://github.com/dmlc/xgboost.git
-[submodule "fortran_udunits2"]
-	path = fortran_udunits2
-	url = https://github.com/GMAO-SI-Team/fortran_udunits2.git
@@ -102,7 +102,6 @@ ifeq ($(ARCH),Linux)
          FC := ifort
          ES_FC := $(FC)
          ESMF_COMPILER := intel
-         FLAP_COMPILER := intel
          FC_FROM_ENV := FALSE
          ifeq ($(ESMF_COMM),intelmpi)
             MPIFC := mpiifort

@@ -36,38 +36,32 @@
     ifeq ($(findstring nvfortran,$(notdir $(FC))),nvfortran)
       ES_FC := $(FC)
       ESMF_COMPILER := nvhpc
-      FLAP_COMPILER := pgi
       FC_FROM_ENV := TRUE
     else
     ifeq ($(findstring nagfor,$(notdir $(FC))),nagfor)
       ES_FC := $(FC)
       ESMF_COMPILER := nag
-      FLAP_COMPILER := nag
       FC_FROM_ENV := TRUE
     else
     ifeq ($(findstring ifx,$(notdir $(FC))),ifx)
       ES_FC := $(FC)
       ESMF_COMPILER := intel
-      FLAP_COMPILER := intel
       FC_FROM_ENV := TRUE
     else
     ifeq ($(findstring ifort,$(notdir $(FC))),ifort)
       ES_FC := $(FC)
       ESMF_COMPILER := intel
-      FLAP_COMPILER := intel
       FC_FROM_ENV := TRUE
     else
     ifeq ($(findstring pgfortran,$(notdir $(FC))),pgfortran)
       ES_FC := $(FC)
       ESMF_COMPILER := pgi
-      FLAP_COMPILER := pgi
       FC_FROM_ENV := TRUE
     else
     ifeq ($(findstring gfortran,$(notdir $(FC))),gfortran)
       ES_FC := $(FC)
       EXCEPTIONS := -fexceptions
       ESMF_COMPILER := gfortran
-      FLAP_COMPILER := gnu
       FC_FROM_ENV := TRUE
     endif
     endif
@@ -80,37 +74,31 @@
     FC := nvfortran
     ES_FC := $(FC)
     ESMF_COMPILER := nvhpc
-    FLAP_COMPILER := pgi
   else
   ifneq ($(wildcard $(shell which nagfor 2> /dev/null)),)
     FC := nagfor
     ES_FC := $(FC)
     ESMF_COMPILER := nag
-    FLAP_COMPILER := nag
   else
   ifeq ($(findstring ifx,$(notdir $(FC))),ifx)
     ES_FC := $(FC)
     ESMF_COMPILER := intel
-    FLAP_COMPILER := intel
   else
   ifneq ($(wildcard $(shell which ifort 2> /dev/null)),)
     FC := ifort
     ES_FC := $(FC)
     ESMF_COMPILER := intel
-    FLAP_COMPILER := intel
   else
   ifneq ($(wildcard $(shell which pgfortran 2> /dev/null)),)
     FC := pgfortran
     ES_FC := $(FC)
     ESMF_COMPILER := pgi
-    FLAP_COMPILER := pgi
   else
   ifneq ($(wildcard $(shell which gfortran 2> /dev/null)),)
     FC := gfortran
     ES_FC := $(FC)
     EXCEPTIONS := -fexceptions
     ESMF_COMPILER := gfortran
-    FLAP_COMPILER := gnu
   else
     FC := UNKNOWN
     ES_FC := $(FC)

@@ -4,12 +4,28 @@
 
 ### Updates
 ### Fixed
+### Changed
+### Removed
+### Added
+
+## [7.24.0] - 2024-04-23
+
+### Updates
+
+- ESMF v8.6.1b04
+- NCO 5.2.4
+- curl 8.7.1
+
 ### Changed
 
 - Changed all CMake builds to be "canonical" (`cmake -B build -S .` and `cmake --build build`)
 
 ### Removed
-### Added
+
+- fortran_udunits2
+  - Removed as MAPL now uses its own interface to UDUNITS2
+- FLAP
+  - Removed as MAPL now uses fArgParse
 
 ## [7.23.0] - 2024-03-26
 

@@ -269,9 +269,9 @@ MAKEJOBS := $(if $(MAKEJOBS),$(MAKEJOBS),1)
 #                  --------------------------------
 
 ALLDIRS = antlr2 gsl jpeg zlib szlib curl hdf4 hdf5 netcdf netcdf-fortran netcdf-cxx4 \
-          udunits2 fortran_udunits2 nco cdo nccmp esmf xgboost \
+          udunits2 nco cdo nccmp esmf xgboost \
           GFE \
-          FLAP hdfeos hdfeos5 SDPToolkit
+          hdfeos hdfeos5 SDPToolkit
 
 ifeq ($(ARCH),Darwin)
    NO_DARWIN_DIRS = netcdf-cxx4 hdfeos hdfeos5 SDPToolkit
@@ -292,7 +292,7 @@ ifeq ($(findstring nvfortran,$(notdir $(FC))),nvfortran)
 endif
 
 ESSENTIAL_DIRS = jpeg zlib szlib hdf4 hdf5 netcdf netcdf-fortran \
-					  udunits2 fortran_udunits2 esmf GFE
+					  udunits2 esmf GFE
 
 ifeq ($(MACH),aarch64)
    NO_ARM_DIRS = hdf4 hdfeos hdfeos5 SDPToolkit
@@ -449,7 +449,6 @@ baselibs-config: baselibs-config.mk
 	@echo "ES_CC: $(ES_CC)" >> $(prefix)/etc/CONFIG
 	@echo "ES_CXX: $(ES_CXX)" >> $(prefix)/etc/CONFIG
 	@echo "ES_FC: $(ES_FC)" >> $(prefix)/etc/CONFIG
-	@echo "FLAP_COMPILER: $(FLAP_COMPILER)" >> $(prefix)/etc/CONFIG
 	@echo "" >> $(prefix)/etc/CONFIG
 	@echo "CONFIG_SETUP: $(CONFIG_SETUP)" >> $(prefix)/etc/CONFIG
 	@echo "SYSNAME: $(SYSNAME)" >> $(prefix)/etc/CONFIG
@@ -631,13 +630,6 @@ udunits2.config : udunits2/configure.ac
                       CFLAGS="$(CFLAGS) $(NO_IMPLICIT_FUNCTION_ERROR) $(NO_IMPLICIT_INT_ERROR)" CC=$(NC_CC) FC=$(NC_FC) CXX=$(NC_CXX) F77=$(NC_F77) )
 	@touch $@
 
-fortran_udunits2.config: udunits2.install
-	@echo "Configuring fortran_udunits2"
-	@mkdir -p ./fortran_udunits2/build
-	@(cd ./fortran_udunits2; \
-		cmake -B build -S . --install-prefix=$(prefix) -DCMAKE_PREFIX_PATH=$(prefix) -DCMAKE_Fortran_COMPILER=$(NC_FC))
-	@touch $@
-
 INC_HDF5 = $(prefix)/include/hdf5
 LIB_HDF5 = $(wildcard $(foreach lib, hdf5_hl hdf5 z sz curl,\
            $(prefix)/lib/lib$(lib).a) )
@@ -774,14 +766,6 @@ GFE.config:
 		cmake -B build -S . --install-prefix=$(prefix) -DCMAKE_PREFIX_PATH=$(prefix) -DSKIP_OPENMP=YES )
 	@touch $@
 
-FLAP.config:
-	@echo "Configuring FLAP"
-	@mkdir -p $(prefix)/lib
-	@mkdir -p ./FLAP/build
-	@(cd ./FLAP; \
-		cmake -B build -S . --install-prefix=$(prefix) )
-	@touch $@
-
 antlr2.config : antlr2/configure
 	@echo "Configuring antlr2"
 	@mkdir -p ./antlr2/build
@@ -942,12 +926,6 @@ nccmp.install: nccmp.config
           $(MAKE) install CC=$(NC_CC) FC=$(NC_FC) CXX=$(NC_CXX) F77=$(NC_F77))
 	@touch $@
 
-fortran_udunits2.install: fortran_udunits2.config
-	@echo "Installing fortran_udunits2"
-	@(cd ./fortran_udunits2; \
-		cmake --build build --target install -j $(MAKEJOBS))
-	@touch $@
-
 xgboost.install: xgboost.config
 	@echo "Installing xgboost"
 	@(cd ./xgboost; \
@@ -960,12 +938,6 @@ GFE.install: GFE.config
 		cmake --build build --target install -j $(MAKEJOBS))
 	@touch $@
 
-FLAP.install: FLAP.config
-	@echo "Installing FLAP with CMake"
-	@(cd ./FLAP; \
-		cmake --build build --target install -j 1)
-	@touch $@
-
 # MAT: Note that on Mac machines there seems to be an issue with the libtool setup
 #      in nco. If you just run nco, it never makes the libnco.a library, or at least
 #      does not make it correctly. As the nco/m4/libtool.m4 and, say, the
@@ -1109,14 +1081,6 @@ netcdf-cxx4.distclean:
 	@echo "Cleaning netcdf-cxx4"
 	@rm -rf ./netcdf-cxx4/build
 
-fortran_udunits2.clean:
-	@echo "Cleaning fortran_udunits2"
-	@rm -rf ./fortran_udunits2/build
-
-fortran_udunits2.distclean:
-	@echo "Cleaning fortran_udunits2"
-	@rm -rf ./fortran_udunits2/build
-
 xgboost.clean:
 	@echo "Cleaning xgboost"
 	@rm -rf ./xgboost/build
@@ -1133,14 +1097,6 @@ GFE.distclean:
 	@echo "Cleaning GFE"
 	@rm -rf ./GFE/build
 
-FLAP.clean:
-	@echo "Cleaning FLAP"
-	@rm -rf ./FLAP/build
-
-FLAP.distclean:
-	@echo "Cleaning FLAP"
-	@rm -rf ./FLAP/build
-
 antlr2.clean:
 	@echo "Cleaning antlr2"
 	@rm -rf ./antlr2/build
@@ -1169,9 +1125,6 @@ curl.check: curl.install
 	@echo "Checking curl"
 	@echo "We explicitly do not check cURL due to how long it takes"
 
-fortran_udunits2.check: fortran_udunits2.install
-	@echo "Not sure how to check fortran_udunits2"
-
 xgboost.check: xgboost.install
 	@echo "Not sure how to check xgboost"
 
@@ -1185,9 +1138,6 @@ GFE.check: GFE.install
 		cmake --build build --target tests -j $(MAKEJOBS))
 	@touch $@
 
-FLAP.check: FLAP.install
-	@echo "Not sure how to check FLAP"
-
 antlr2.check: antlr2.install
 	@echo "Checking antlr2"
 	@(cd antlr2/build; \

@@ -12,7 +12,7 @@ NASA/GSFC.
 
 | Library                                                                  | Version      |
 | ---                                                                      | ---          |
-| [ESMF](https://github.com/esmf-org/esmf)                                 | v8.6.0       |
+| [ESMF](https://github.com/esmf-org/esmf)                                 | v8.6.1b04    |
 | [netCDF](https://github.com/Unidata/netcdf-c)                            | 4.9.2        |
 | [netCDF Fortran](https://github.com/Unidata/netcdf-fortran)              | 4.6.1        |
 | [netCDF C++](https://github.com/Unidata/netcdf-cxx4)                     | 4.3.1        |
@@ -25,13 +25,11 @@ NASA/GSFC.
 | [jpeg](http://www.ijg.org/)                                              | 9e           |
 | [zlib](http://www.zlib.net/)                                             | 1.3.1        |
 | [szip](https://support.hdfgroup.org/doc_resource/SZIP/)                  | 2.1.1        |
-| [cURL](https://curl.haxx.se/)                                            | 8.6.0        |
+| [cURL](https://curl.haxx.se/)                                            | 8.7.1        |
 | [UDUNITS2](https://github.com/GMAO-SI-Team/UDUNITS-2.git)                | 2.2.28       |
-| [fortran_udunits2](https://github.com/GMAO-SI-Team/fortran_udunits2.git) | v1.0.0-rc.3  |
-| [NCO](http://nco.sourceforge.net/)                                       | 5.2.2        |
+| [NCO](http://nco.sourceforge.net/)                                       | 5.2.4        |
 | [CDO](https://code.mpimet.mpg.de/projects/cdo)                           | 2.3.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          |
 | [HDF-EOS5](https://wiki.earthdata.nasa.gov/display/DAS)                  | 2.0          |
 | [SDP Toolkit](https://wiki.earthdata.nasa.gov/display/DAS)               | 5.2.20       |

@@ -1 +1 @@
-7.23.0
+7.24.0
@@ -177,13 +177,6 @@ then
    echo_version fArgParse "$FARGPARSE_VERSION" "$FARGPARSE_VERSION_LOC"
 fi
 
-FLAP_VERSION_LOC="FLAP/README.md"
-if [[ -e $FLAP_VERSION_LOC ]]
-then
-   FLAP_VERSION=$(grep '^ *version' ${FLAP_VERSION_LOC} | awk '{print $3}' | sed "s/'//g")
-   echo_version FLAP "$FLAP_VERSION" "$FLAP_VERSION_LOC"
-fi
-
 HDFEOS_VERSION_LOC="hdfeos/src/EHapi.c"
 if [[ -e $HDFEOS_VERSION_LOC ]]
 then
+10 −4		bld/nco.spec
+15 −15		bld/nco_dst.pl
+9 −6		bm/NCO_rgr.pm
+10 −10		configure
+1 −1		configure.ac
+3 −3		configure.eg
+83 −36		data/ncclimo
+17 −7		data/ncremap
+12 −0		debian/changelog
+47 −40		doc/ANNOUNCE
+116 −0		doc/ChangeLog
+1 −1		doc/VERSION
+81 −81		doc/debian.txt
+35 −27		doc/index.shtml
+109 −30		doc/nco.texi
+1 −0		src/nco++/ncap2.cc
+1 −0		src/nco/ncatted.c
+5 −4		src/nco/ncbo.c
+7 −5		src/nco/ncecat.c
+7 −5		src/nco/ncflint.c
+6 −4		src/nco/ncks.c
+2 −2		src/nco/nco.h
+11 −11		src/nco/nco_ctl.c
+9 −1		src/nco/nco_flt.c
+1 −1		src/nco/nco_flt.h
+10 −7		src/nco/nco_grp_utl.c
+1 −1		src/nco/nco_grp_utl.h
+2 −2		src/nco/nco_msa.c
+6 −5		src/nco/nco_mss_val.c
+7 −1		src/nco/nco_netcdf.c
+36 −5		src/nco/nco_ppc.c
+5 −2		src/nco/nco_ppc.h
+1 −1		src/nco/nco_prn.h
+30 −10		src/nco/nco_rgr.c
+1 −1		src/nco/nco_rgr.h
+1 −1		src/nco/nco_scm.c
+5 −5		src/nco/nco_var_utl.c
+1 −1		src/nco/nco_var_utl.h
+7 −5		src/nco/ncpdq.c
+9 −7		src/nco/ncra.c
+1 −0		src/nco/ncrename.c
+7 −5		src/nco/ncwa.c