Update to FMS 2024.01.02, fix build issue with SDPToolkit (#208)

* Fix build issue with SDPToolkit * Update to FMS 2024.01.02 * Fix up toolkit * Update version * Fix GNU make bug
GEOS-ESM · Jun 24, 2024 · e91f9b9 · e91f9b9
1 parent 7076565
commit e91f9b9
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 10 deletions.
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -41,13 +41,13 @@ jobs:
           git submodule status
       - name: Verify Before
         run: |
-          make verify BUILD=ESSENTIALS ESMF_COMM=openmpi ESMF_COMPILER=gfortran
+          make verify ESMF_COMM=openmpi ESMF_COMPILER=gfortran
       - name: Build
         run: |
-          make -j4 install BUILD=ESSENTIALS ESMF_COMM=openmpi ESMF_PYTHON=/usr/bin/python3 ESMF_COMPILER=gfortran
+          make -j4 install ESMF_COMM=openmpi ESMF_PYTHON=/usr/bin/python3 ESMF_COMPILER=gfortran
       - name: Verify After
         run: |
-          make verify BUILD=ESSENTIALS ESMF_COMM=openmpi ESMF_COMPILER=gfortran
+          make verify ESMF_COMM=openmpi ESMF_COMPILER=gfortran
       - name: Check directory structure
         run: |
           ls ../x86_64-pc-linux-gnu/gfortran/Linux/*
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,12 +5,23 @@
 ### Updates
 ### Fixed
 ### Changed
-
-- Update docker image in CI workflow
-
 ### Removed
 ### Added
 
+## [8.3.0] - 2024-06-24
+
+### Updates
+
+- FMS 2024.01.02
+
+### Fixed
+
+- Undo `autoreconf` for SDPToolkit
+
+### Changed
+
+- Update docker image in CI workflow
+
 ## [8.2.0] - 2024-06-24
 
 ### Updates

diff --git a/FMS b/FMS
diff --git a/GNUmakefile b/GNUmakefile
@@ -889,11 +889,11 @@ SDPToolkit.download : scripts/download_SDPToolkit.bash
 
 SDPToolkit.config: SDPToolkit.download SDPToolkit/configure hdfeos5.install
 	@echo "Configuring SDPToolkit $*"
+	@cp config.guess ./TOOLKIT/config/config.guess
 	@(cd SDPToolkit; \
           export PATH="$(prefix)/bin:$(PATH)" ;\
           export CPPFLAGS="$(CPPFLAGS) $(INC_SUPP_SDP)";\
           export LIBS="-L$(prefix)/lib $(LIB_NETCDF) $(LIB_CURL) -lexpat $(LIB_HDF4) -lsz -ljpeg $(LINK_GPFS) -ldl -lm" ;\
-          autoreconf -f -v -i;\
           ./configure --prefix=$(prefix) \
                       --includedir=$(prefix)/include/SDPToolkit \
                       $(WITH_ZLIB) \

diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ NASA/GSFC.
 | Library                                                                  | Version      |
 | ---                                                                      | ---          |
 | [ESMF](https://github.com/esmf-org/esmf)                                 | v8.6.1       |
-| [FMS](https://github.com/NOAA-GFDL/FMS/)                                 | 2024.01.01   |
+| [FMS](https://github.com/NOAA-GFDL/FMS/)                                 | 2024.01.02   |
 | [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        |

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-8.2.0
+8.3.0
+19 −0		CHANGELOG.md
+1 −1		CMakeLists.txt
+1 −1		configure.ac
+1 −1		diag_manager/diag_manager.F90
+17 −12		diag_manager/fms_diag_file_object.F90
+11 −2		diag_manager/fms_diag_object.F90
+1 −1		libFMS/Makefile.am
+4 −3		test_fms/diag_manager/Makefile.am
+124 −0		test_fms/diag_manager/test_prepend_date.F90
+87 −0		test_fms/diag_manager/test_prepend_date.sh