v12: Updates for FMS 2025 Support, remove mom5

.circleci/config.yml

@@ -16,12 +16,12 @@ parameters:
 
 # Anchors to prevent forgetting to update a version
 os_version: &os_version ubuntu24
-baselibs_version: &baselibs_version v8.32.0
+baselibs_version: &baselibs_version v9.12.0
 bcs_version: &bcs_version v12.0.0
 tag_build_arg_name: &tag_build_arg_name gcmversion
 
 orbs:
-  ci: geos-esm/circleci-tools@5
+  ci: geos-esm/circleci-tools@6
 
 workflows:
   build-test:

.github/workflows/workflow.yml

@@ -28,6 +28,11 @@ jobs:
     with:
       compiler: ${{ matrix.compiler }}
       cmake-build-type: ${{ matrix.build-type }}
+      # We need to not run mepo develop for now as it will "override" components
+      # that have been specifically put in components.yaml for this fixture.
+      # We'll need to undo this once we have updated the fixture
+      run-mepo-develop: false
+      baselibs-version: v9.12.0
 
   spack_build:
     uses: GEOS-ESM/CI-workflows/.github/workflows/spack_gcc_build.yml@project/geosgcm

CMakeLists.txt

@@ -4,7 +4,7 @@ cmake_policy (SET CMP0054 NEW)
 
 project (
   GEOSgcm
-  VERSION 11.10.0
+  VERSION 12.0.0
   LANGUAGES Fortran CXX C)  # Note - CXX is required for ESMF
 
 if ("${PROJECT_SOURCE_DIR}" STREQUAL "${PROJECT_BINARY_DIR}")
@@ -26,10 +26,7 @@ set (DOING_GEOS5 YES)
 # Should find a better place for this - used in Chem component
 set (ACG_FLAGS -v)
 
-# This flag at R4R8 means that FV3 is compiled at R4 but *linked* to
-# FMS built at R8. This is needed as MOM6 is currently compiled as R8
-# and so the linker can only link to one FMS library.
-set (FV_PRECISION "R4R8" CACHE STRING "Precision of FV3 core (R4, R4R8, R8)")
+set (FV_PRECISION "R4" CACHE STRING "Precision of FV3 core (R4, R8)")
 
 # mepo can now clone subrepos in three styles
 foreach (dir cmake @cmake cmake@)
@@ -80,7 +77,7 @@ if (NOT Baselibs_FOUND)
   # Another issue with historical reasons, old/wrong zlib target used in GEOS
   add_library(ZLIB::zlib ALIAS ZLIB::ZLIB)
 
-  find_package(FMS REQUIRED COMPONENTS R4 R8)
+  find_package(FMS 2025.4 REQUIRED)
 
   # At the moment, there is no way to know if FMS was built with YAML
   # so we need to rely on the user to set this option.
@@ -90,8 +87,7 @@ if (NOT Baselibs_FOUND)
     find_package(libyaml REQUIRED)
     message(STATUS "LIBYAML_INCLUDE_DIR: ${LIBYAML_INCLUDE_DIR}")
     message(STATUS "LIBYAML_LIBRARIES: ${LIBYAML_LIBRARIES}")
-    target_link_libraries(FMS::fms_r4 INTERFACE ${LIBYAML_LIBRARIES})
-    target_link_libraries(FMS::fms_r8 INTERFACE ${LIBYAML_LIBRARIES})
+    target_link_libraries(FMS::fms INTERFACE ${LIBYAML_LIBRARIES})
   endif ()
 
   find_package(MAPL 2.69 QUIET)

README.md

@@ -16,8 +16,8 @@
 | [CICE](https://github.com/GEOS-ESM/CICE)                                       | [geos/v0.2.0](https://github.com/GEOS-ESM/CICE/releases/tag/geos%2Fv0.2.0)                            |
 | [CPLFCST_Etc](https://github.com/GEOS-ESM/CPLFCST_Etc)                         | [v1.0.1](https://github.com/GEOS-ESM/CPLFCST_Etc/releases/tag/v1.0.1)                                 |
 | [ecbuild](https://github.com/GEOS-ESM/ecbuild)                                 | [geos/v3.13.1](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv3.13.1)                       |
-| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake)                           | [v4.37.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.37.0)                                |
-| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env)                               | [v5.22.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.22.0)                                  |
+| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake)                           | [v5.12.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v5.12.0)                                |
+| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env)                               | [v6.8.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v6.8.0)                                    |
 | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp)   | [v3.0.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v3.0.0)                      |
 | [GAAS](https://github.com/GEOS-ESM/GAAS)                                       | [v1.1.0](https://github.com/GEOS-ESM/GAAS/releases/tag/v1.1.0)                                        |
 | [geos-chem](https://github.com/GEOS-ESM/geos-chem)                             | [geos/v13.0.0-rc1](https://github.com/GEOS-ESM/geos-chem/releases/tag/geos%2Fv13.0.0-rc1)             |
@@ -41,7 +41,6 @@
 | [MAPL](https://github.com/GEOS-ESM/MAPL)                                       | [v2.69.1](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.69.1)                                      |
 | [MATRIX](https://github.com/GEOS-ESM/MATRIX)                                   | [v1.0.0](https://github.com/GEOS-ESM/MATRIX/releases/tag/v1.0.0)                                      |
 | [MITgcm](https://github.com/GEOS-ESM/MITgcm)                                   | [checkpoint68o](https://github.com/GEOS-ESM/MITgcm/releases/tag/checkpoint68o)                        |
-| [MOM5](https://github.com/GEOS-ESM/MOM5)                                       | [geos/5.1.0+1.2.0](https://github.com/GEOS-ESM/MOM5/releases/tag/geos%2F5.1.0%2B1.2.0)                |
 | [MOM6](https://github.com/GEOS-ESM/MOM6)                                       | [geos/v3.8](https://github.com/GEOS-ESM/MOM6/tree/geos/v3.8)                                          |
 | [NCEP_Shared](https://github.com/GEOS-ESM/NCEP_Shared)                         | [v1.5.0](https://github.com/GEOS-ESM/NCEP_Shared/releases/tag/v1.5.0)                                 |
 | [QuickChem](https://github.com/GEOS-ESM/QuickChem)                             | [v1.0.0](https://github.com/GEOS-ESM/QuickChem/releases/tag/v1.0.0)                                   |

components.yaml

@@ -5,13 +5,13 @@ GEOSgcm:
 env:
   local: ./@env
   remote: ../ESMA_env.git
-  tag: v5.22.0
+  tag: v6.8.0
   develop: main
 
 cmake:
   local: ./@cmake
   remote: ../ESMA_cmake.git
-  tag: v4.37.0
+  tag: v5.12.0
   develop: develop
 
 ecbuild:
@@ -31,7 +31,7 @@ GMAO_Shared:
   remote: ../GMAO_Shared.git
   tag: v3.0.0
   sparse: ./config/GMAO_Shared.sparse
-  develop: main
+  develop: feature/sdrabenh/gcm_v12
 
 GEOS_Util:
   local: ./src/Shared/@GMAO_Shared/@GEOS_Util
@@ -56,9 +56,10 @@ MAPL:
 GEOSgcm_GridComp:
   local: ./src/Components/@GEOSgcm_GridComp
   remote: ../GEOSgcm_GridComp.git
-  tag: v3.0.0
+  #tag: v3.0.0
+  branch: feature/v12-remove-mom5
   sparse: ./config/GEOSgcm_GridComp.sparse
-  develop: develop
+  develop: feature/sdrabenh/gcm_v12
 
 geos_state_bias:
   local: ./src/Components/@GEOSgcm_GridComp/GEOSmkiau_GridComp/pyMLINC/@geos_state_bias
@@ -75,13 +76,15 @@ GigaTraj:
 FVdycoreCubed_GridComp:
   local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp
   remote: ../FVdycoreCubed_GridComp.git
-  tag: v3.0.0
+  #tag: v3.0.0
+  branch: feature/v12-fms2025-useifdef
   develop: develop
 
 fvdycore:
   local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp/@fvdycore
   remote: ../GFDL_atmos_cubed_sphere.git
-  tag: geos/v3.0.0
+  #tag: geos/v3.0.0
+  branch: feature/v12-fms2025-useifdef
   develop: develop
 
 GEOSchem_GridComp:
@@ -171,15 +174,10 @@ ACHEM:
 GEOS_OceanGridComp:
   local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp
   remote: ../GEOS_OceanGridComp.git
-  tag: v3.10.0
+  #tag: v3.10.0
+  branch: feature/v12-remove-mom5
   develop: develop
 
-mom:
-  local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp/MOM_GEOS5PlugMod/@mom
-  remote: ../MOM5.git
-  tag: geos/5.1.0+2.1.0
-  develop: geos5
-
 mom6:
   local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp/MOM6_GEOSPlug/@mom6
   remote: ../MOM6.git
@@ -242,7 +240,8 @@ umwm:
 GEOSgcm_App:
   local: ./src/Applications/@GEOSgcm_App
   remote: ../GEOSgcm_App.git
-  tag: v3.0.0
+  #tag: v3.0.0
+  branch: feature/v12-remove-mom5
   develop: develop
 
 UMD_Etc: