From 65c0cda3e7646f1f6c07aeb5f8dec7baa074b635 Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst Date: Wed, 17 Apr 2024 12:12:59 -0400 Subject: [PATCH 001/241] Update fixture with GCMv12_rc1 tag --- components.yaml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/components.yaml b/components.yaml index 8fb47a93..d7d947f6 100644 --- a/components.yaml +++ b/components.yaml @@ -36,14 +36,14 @@ GMAO_Shared: GEOS_Util: local: ./src/Shared/@GMAO_Shared/@GEOS_Util remote: ../GEOS_Util.git - tag: v2.0.8 - develop: main + tag: GCMv12_rc1 + develop: feature/sdrabenh/gcm_v12-rc1 MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - tag: v2.44.2 - develop: develop + tag: GCMv12_rc1 + develop: feature/sdrabenh/gcm_v12-rc1 FMS: local: ./src/Shared/@FMS @@ -54,21 +54,21 @@ FMS: GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - tag: v2.5.2 + tag: GCMv12_rc1 sparse: ./config/GEOSgcm_GridComp.sparse - develop: develop + develop: feature/sdrabenh/gcm_v12-rc1 FVdycoreCubed_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp remote: ../FVdycoreCubed_GridComp.git - tag: v2.11.0 - develop: develop + tag: GCMv12_rc1 + develop: feature/sdrabenh/gcm_v12-rc1 fvdycore: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp/@fvdycore remote: ../GFDL_atmos_cubed_sphere.git - tag: geos/v2.8.1 - develop: geos/develop + tag: GCMv12_rc1 + develop: feature/sdrabenh/gcm_v12-rc1 GEOSchem_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp @@ -189,8 +189,8 @@ umwm: GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git - tag: v2.3.2 - develop: develop + tag: GCMv12_rc1 + develop: feature/sdrabenh/gcm_v12-rc1 UMD_Etc: local: ./src/Applications/@UMD_Etc From 1c385523a52acb75349ed678e2f108043478e3d2 Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst Date: Fri, 26 Apr 2024 13:05:24 -0400 Subject: [PATCH 002/241] Update with tag GCMv12_rc2 --- components.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/components.yaml b/components.yaml index 64d9690c..75a4a760 100644 --- a/components.yaml +++ b/components.yaml @@ -36,13 +36,13 @@ GMAO_Shared: GEOS_Util: local: ./src/Shared/@GMAO_Shared/@GEOS_Util remote: ../GEOS_Util.git - tag: GCMv12_rc1 + tag: GCMv12_rc2 develop: feature/sdrabenh/gcm_v12-rc1 MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - tag: GCMv12_rc1 + tag: GCMv12_rc2 develop: feature/sdrabenh/gcm_v12-rc1 FMS: @@ -54,27 +54,27 @@ FMS: GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - tag: GCMv12_rc1 + tag: GCMv12_rc2 sparse: ./config/GEOSgcm_GridComp.sparse develop: feature/sdrabenh/gcm_v12-rc1 FVdycoreCubed_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp remote: ../FVdycoreCubed_GridComp.git - tag: GCMv12_rc1 + tag: GCMv12_rc2 develop: feature/sdrabenh/gcm_v12-rc1 fvdycore: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp/@fvdycore remote: ../GFDL_atmos_cubed_sphere.git - tag: GCMv12_rc1 + tag: GCMv12_rc2 develop: feature/sdrabenh/gcm_v12-rc1 GEOSchem_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp remote: ../GEOSchem_GridComp.git - tag: v1.13.1 - develop: develop + tag: GCMv12_rc2 + develop: feature/sdrabenh/gcm_v12-rc1 HEMCO: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/Shared/HEMCO/@HEMCO @@ -164,8 +164,8 @@ sis2: GEOSradiation_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSradiation_GridComp remote: ../GEOSradiation_GridComp.git - tag: v1.8.0 - develop: develop + tag: GCMv12_rc2 + develop: feature/sdrabenh/gcm_v12-rc1 RRTMGP: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSradiation_GridComp/GEOS_RadiationShared/@RRTMGP @@ -189,7 +189,7 @@ umwm: GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git - tag: GCMv12_rc1 + tag: GCMv12_rc2 develop: feature/sdrabenh/gcm_v12-rc1 UMD_Etc: From ae22c8dad857613402eba65a00a7b5e75f9cfde3 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 20 May 2024 14:00:38 -0400 Subject: [PATCH 003/241] Updates for v12 branch for FMS-in-Baselibs --- CMakeLists.txt | 14 ++++---------- README.md | 9 ++++----- components.yaml | 16 +++++----------- 3 files changed, 13 insertions(+), 26 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f78a130f..aa43cc01 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -93,16 +93,10 @@ if (NOT Baselibs_FOUND) # Another issue with historical reasons, old/wrong zlib target used in GEOS add_library(ZLIB::zlib ALIAS ZLIB::ZLIB) - # Using FMS from spack requires updates to fvdycore due to interface changes - # in FMS 2022. This is commented for now until this transition can occur. - ################################################# - # find_package(FMS QUIET COMPONENTS R4 R8) # - # if (FMS_FOUND) # - # # We need aliases due to historical reasons # - # add_library(fms_r4 ALIAS FMS::fms_r4) # - # add_library(fms_r8 ALIAS FMS::fms_r8) # - # endif () # - ################################################# + find_package(FMS REQUIRED COMPONENTS R4 R8) + # We need aliases due to historical reasons + add_library(fms_r4 ALIAS FMS::fms_r4) + add_library(fms_r8 ALIAS FMS::fms_r8) endif () diff --git a/README.md b/README.md index 5d5345b6..1d551fd8 100644 --- a/README.md +++ b/README.md @@ -15,10 +15,9 @@ | [CICE](https://github.com/GEOS-ESM/CICE) | [geos/v0.1.3](https://github.com/GEOS-ESM/CICE/releases/tag/geos%2Fv0.1.3) | | [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/v1.3.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv1.3.0) | -| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v3.44.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v3.44.0) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v3.45.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v3.45.0) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v4.28.1](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v4.28.1) | -| [FMS](https://github.com/GEOS-ESM/FMS) | [geos/2019.01.02+noaff.8](https://github.com/GEOS-ESM/FMS/releases/tag/geos%2F2019.01.02%2Bnoaff.8) | -| [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.11.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.11.0) | +| [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.11.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.11.1) | | [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) | | [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v2.1.6](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v2.1.6) | | [GEOS_Util](https://github.com/GEOS-ESM/GEOS_Util) | [v2.0.8](https://github.com/GEOS-ESM/GEOS_Util/releases/tag/v2.0.8) | @@ -26,13 +25,13 @@ | [GEOSgcm_App](https://github.com/GEOS-ESM/GEOSgcm_App) | [v2.3.2](https://github.com/GEOS-ESM/GEOSgcm_App/releases/tag/v2.3.2) | | [GEOSgcm_GridComp](https://github.com/GEOS-ESM/GEOSgcm_GridComp) | [v2.5.2](https://github.com/GEOS-ESM/GEOSgcm_GridComp/releases/tag/v2.5.2) | | [GEOSradiation_GridComp](https://github.com/GEOS-ESM/GEOSradiation_GridComp) | [v1.8.0](https://github.com/GEOS-ESM/GEOSradiation_GridComp/releases/tag/v1.8.0) | -| [GFDL_atmos_cubed_sphere](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere) | [geos/v2.8.1](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere/releases/tag/geos%2Fv2.8.1) | +| [GFDL_atmos_cubed_sphere](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere) | [geos/v2.8.2](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere/releases/tag/geos%2Fv2.8.2) | | [GMI](https://github.com/GEOS-ESM/GMI) | [v1.1.0](https://github.com/GEOS-ESM/GMI/releases/tag/v1.1.0) | | [GMAO_Shared](https://github.com/GEOS-ESM/GMAO_Shared) | [v1.9.7](https://github.com/GEOS-ESM/GMAO_Shared/releases/tag/v1.9.7) | | [GOCART](https://github.com/GEOS-ESM/GOCART) | [sdr_v2.2.1.1](https://github.com/GEOS-ESM/GOCART/releases/tag/sdr_v2.2.1.1) | | [HEMCO](https://github.com/GEOS-ESM/HEMCO) | [geos/v2.2.3](https://github.com/GEOS-ESM/HEMCO/releases/tag/geos%2Fv2.2.3) | | [Icepack](https://github.com/GEOS-ESM/Icepack) | [geos/v0.2.0](https://github.com/GEOS-ESM/Icepack/releases/tag/geos%2Fv0.2.0) | -| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.44.2](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.44.2) | +| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.45.0](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.45.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.1](https://github.com/GEOS-ESM/MOM6/tree/geos/v3.1) | diff --git a/components.yaml b/components.yaml index 75a4a760..34bd2a80 100644 --- a/components.yaml +++ b/components.yaml @@ -5,13 +5,13 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v4.28.1 + branch: feature/mathomp4/fms-baselibs develop: main cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v3.44.0 + branch: feature/mathomp4/fms-baselibs develop: develop ecbuild: @@ -45,12 +45,6 @@ MAPL: tag: GCMv12_rc2 develop: feature/sdrabenh/gcm_v12-rc1 -FMS: - local: ./src/Shared/@FMS - remote: ../FMS.git - tag: geos/2019.01.02+noaff.8 - develop: geos/release/2019.01 - GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git @@ -67,7 +61,7 @@ FVdycoreCubed_GridComp: fvdycore: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp/@fvdycore remote: ../GFDL_atmos_cubed_sphere.git - tag: GCMv12_rc2 + tag: feature/mathomp4/fms-baselibs-v12 develop: feature/sdrabenh/gcm_v12-rc1 GEOSchem_GridComp: @@ -121,13 +115,13 @@ StratChem: GEOS_OceanGridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp remote: ../GEOS_OceanGridComp.git - tag: v2.1.6 + branch: feature/mathomp4/fms-baselibs develop: develop mom: local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp/MOM_GEOS5PlugMod/@mom remote: ../MOM5.git - tag: geos/5.1.0+1.2.0 + branch: feature/mathomp4/fms-baselibs develop: geos5 mom6: From c8f00bbdc36cfe83f4b0a992cd07b7a174a31947 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 21 May 2024 13:33:58 -0400 Subject: [PATCH 004/241] Update to ESMA_env v5.0.0 and ESMA_cmake v4.0.0 --- README.md | 4 ++-- components.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1d551fd8..7330bc84 100644 --- a/README.md +++ b/README.md @@ -15,8 +15,8 @@ | [CICE](https://github.com/GEOS-ESM/CICE) | [geos/v0.1.3](https://github.com/GEOS-ESM/CICE/releases/tag/geos%2Fv0.1.3) | | [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/v1.3.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv1.3.0) | -| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v3.45.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v3.45.0) | -| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v4.28.1](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v4.28.1) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.0.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.0.0) | +| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.0.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.0.0) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.11.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.11.1) | | [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) | | [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v2.1.6](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v2.1.6) | diff --git a/components.yaml b/components.yaml index 34bd2a80..dca6aedf 100644 --- a/components.yaml +++ b/components.yaml @@ -5,13 +5,13 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - branch: feature/mathomp4/fms-baselibs + tag: v5.0.0 develop: main cmake: local: ./@cmake remote: ../ESMA_cmake.git - branch: feature/mathomp4/fms-baselibs + tag: v4.0.0 develop: develop ecbuild: From d50045c9ac0f0c14f2f106bfb1780f3d0c1b5bbb Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 21 May 2024 13:43:58 -0400 Subject: [PATCH 005/241] Fix up CI to use circleci-tools v3 --- .circleci/config.yml | 4 ++-- .github/workflows/workflow.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d928bbc2..76bea383 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,12 +16,12 @@ parameters: # Anchors to prevent forgetting to update a version os_version: &os_version ubuntu20 -baselibs_version: &baselibs_version v7.23.0 +baselibs_version: &baselibs_version v8.0.2 bcs_version: &bcs_version v11.3.0 tag_build_arg_name: &tag_build_arg_name gcmversion orbs: - ci: geos-esm/circleci-tools@2 + ci: geos-esm/circleci-tools@3 workflows: build-test: diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index ab4d8b51..5dd2230f 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -19,7 +19,7 @@ jobs: if: "!contains(github.event.pull_request.labels.*.name, '0 diff trivial')" runs-on: ubuntu-latest container: - image: gmao/ubuntu20-geos-env:v7.23.0-intelmpi_2021.6.0-intel_2022.1.0 + image: gmao/ubuntu20-geos-env:v8.0.2-intelmpi_2021.6.0-intel_2022.1.0 # Per https://github.com/actions/virtual-environments/issues/1445#issuecomment-713861495 # It seems like we might not need secrets on GitHub Actions which is good for forked # pull requests From 6627f6fd34f178d83b8a131e0602f954b6c3ce74 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 21 May 2024 13:46:48 -0400 Subject: [PATCH 006/241] Fixes from non-v12 branch --- .circleci/config.yml | 4 ++-- CMakeLists.txt | 35 +++++++++++------------------------ README.md | 6 +++--- components.yaml | 2 +- 4 files changed, 17 insertions(+), 30 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 76bea383..0b73975f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -103,9 +103,9 @@ workflows: bcs_version: *bcs_version container_name: geosgcm mpi_name: openmpi - mpi_version: 5.0.0 + mpi_version: 5.0.2 compiler_name: gcc - compiler_version: 12.1.0 + compiler_version: 13.2.0 image_name: geos-env-bcs tag_build_arg_name: *tag_build_arg_name resource_class: xlarge diff --git a/CMakeLists.txt b/CMakeLists.txt index aa43cc01..e8d19f9c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,31 +60,18 @@ if (NOT Baselibs_FOUND) add_definitions(-DH5_HAVE_PARALLEL) endif() - if (NOT TARGET esmf) - if (DEFINED ENV{esmf_ROOT}) - message (STATUS "Found esmf_ROOT in environment: $ENV{esmf_ROOT}") - find_path(ESMF_CMAKE_PATH FindESMF.cmake HINTS "$ENV{esmf_ROOT}/cmake") - message (STATUS "Found FindESMF.cmake in: ${ESMF_CMAKE_PATH}") - if (ESMF_CMAKE_PATH) - message (STATUS "Appending to CMAKE_PREFIX_PATH: ${ESMF_CMAKE_PATH}") - list (APPEND CMAKE_MODULE_PATH ${ESMF_CMAKE_PATH}) - endif () + if (NOT TARGET ESMF::ESMF) + find_package(ESMF 8.6.1 MODULE REQUIRED) + target_link_libraries(ESMF::ESMF INTERFACE MPI::MPI_Fortran) + + # GEOS uses lowercase target due to historical reasons but + # the latest FindESMF.cmake file from ESMF produces an ESMF::ESMF target. + if (NOT TARGET esmf) + add_library(esmf ALIAS ESMF::ESMF) + endif () + if (NOT TARGET ESMF) + add_library(ESMF ALIAS ESMF::ESMF) endif () - - find_package(ESMF MODULE REQUIRED) - - # ESMF as used in MAPL requires MPI - # NOTE: This looks odd because some versions of FindESMF.cmake out in the - # world provide an "esmf" target while others provide "ESMF". So we - # need this ugliness to support both. - if (TARGET esmf) - target_link_libraries(esmf INTERFACE MPI::MPI_Fortran) - else() - target_link_libraries(ESMF INTERFACE MPI::MPI_Fortran) - # MAPL and GEOS use lowercase target due to historical reasons but - # the latest FindESMF.cmake file from ESMF produces an ESMF target. - add_library(esmf ALIAS ESMF) - endif() endif () find_package(GFTL_SHARED REQUIRED) diff --git a/README.md b/README.md index 7330bc84..1635caf8 100644 --- a/README.md +++ b/README.md @@ -25,13 +25,13 @@ | [GEOSgcm_App](https://github.com/GEOS-ESM/GEOSgcm_App) | [v2.3.2](https://github.com/GEOS-ESM/GEOSgcm_App/releases/tag/v2.3.2) | | [GEOSgcm_GridComp](https://github.com/GEOS-ESM/GEOSgcm_GridComp) | [v2.5.2](https://github.com/GEOS-ESM/GEOSgcm_GridComp/releases/tag/v2.5.2) | | [GEOSradiation_GridComp](https://github.com/GEOS-ESM/GEOSradiation_GridComp) | [v1.8.0](https://github.com/GEOS-ESM/GEOSradiation_GridComp/releases/tag/v1.8.0) | -| [GFDL_atmos_cubed_sphere](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere) | [geos/v2.8.2](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere/releases/tag/geos%2Fv2.8.2) | +| [GFDL_atmos_cubed_sphere](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere) | [geos/v2.9.0](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere/releases/tag/geos%2Fv2.9.0) | | [GMI](https://github.com/GEOS-ESM/GMI) | [v1.1.0](https://github.com/GEOS-ESM/GMI/releases/tag/v1.1.0) | | [GMAO_Shared](https://github.com/GEOS-ESM/GMAO_Shared) | [v1.9.7](https://github.com/GEOS-ESM/GMAO_Shared/releases/tag/v1.9.7) | -| [GOCART](https://github.com/GEOS-ESM/GOCART) | [sdr_v2.2.1.1](https://github.com/GEOS-ESM/GOCART/releases/tag/sdr_v2.2.1.1) | +| [GOCART](https://github.com/GEOS-ESM/GOCART) | [sdr_v2.2.1.2](https://github.com/GEOS-ESM/GOCART/releases/tag/sdr_v2.2.1.2) | | [HEMCO](https://github.com/GEOS-ESM/HEMCO) | [geos/v2.2.3](https://github.com/GEOS-ESM/HEMCO/releases/tag/geos%2Fv2.2.3) | | [Icepack](https://github.com/GEOS-ESM/Icepack) | [geos/v0.2.0](https://github.com/GEOS-ESM/Icepack/releases/tag/geos%2Fv0.2.0) | -| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.45.0](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.45.0) | +| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.46.1](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.46.1) | | [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.1](https://github.com/GEOS-ESM/MOM6/tree/geos/v3.1) | diff --git a/components.yaml b/components.yaml index dca6aedf..120e7020 100644 --- a/components.yaml +++ b/components.yaml @@ -85,7 +85,7 @@ geos-chem: GOCART: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@GOCART remote: ../GOCART.git - tag: sdr_v2.2.1.1 + tag: sdr_v2.2.1.2 develop: develop QuickChem: From d24a5ce7f5a9e68c88e36d1b2fd1e5de5def5072 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 21 May 2024 13:49:02 -0400 Subject: [PATCH 007/241] Remove GNU Coupled run --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0b73975f..191fcabf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -58,7 +58,7 @@ workflows: - docker-hub-creds matrix: parameters: - compiler: [gfortran, ifort] + compiler: [ifort] baselibs_version: *baselibs_version bcs_version: *bcs_version requires: From ad038d3c4c0d6d34a838ce241d604938237e18a8 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 29 May 2024 09:58:49 -0400 Subject: [PATCH 008/241] Update to mom geos/5.1.0+2.0.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1635caf8..13166e2b 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ | [Icepack](https://github.com/GEOS-ESM/Icepack) | [geos/v0.2.0](https://github.com/GEOS-ESM/Icepack/releases/tag/geos%2Fv0.2.0) | | [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.46.1](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.46.1) | | [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) | +| [MOM5](https://github.com/GEOS-ESM/MOM5) | [geos/5.1.0+2.0.0](https://github.com/GEOS-ESM/MOM5/releases/tag/geos%2F5.1.0%2B2.0.0) | | [MOM6](https://github.com/GEOS-ESM/MOM6) | [geos/v3.1](https://github.com/GEOS-ESM/MOM6/tree/geos/v3.1) | | [NCEP_Shared](https://github.com/GEOS-ESM/NCEP_Shared) | [v1.3.0](https://github.com/GEOS-ESM/NCEP_Shared/releases/tag/v1.3.0) | | [QuickChem](https://github.com/GEOS-ESM/QuickChem) | [v1.0.0](https://github.com/GEOS-ESM/QuickChem/releases/tag/v1.0.0) | diff --git a/components.yaml b/components.yaml index 120e7020..e55fe42b 100644 --- a/components.yaml +++ b/components.yaml @@ -121,7 +121,7 @@ GEOS_OceanGridComp: mom: local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp/MOM_GEOS5PlugMod/@mom remote: ../MOM5.git - branch: feature/mathomp4/fms-baselibs + tag: geos/5.1.0+2.0.0 develop: geos5 mom6: From 4fff370c1e40995b1634e2fb7f8ee27843647576 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 29 May 2024 14:13:34 -0400 Subject: [PATCH 009/241] Update to Ocean v3.0.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 13166e2b..5972593a 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.0.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.0.0) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.11.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.11.1) | | [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) | -| [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v2.1.6](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v2.1.6) | +| [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v2.1.7](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v2.1.7) | | [GEOS_Util](https://github.com/GEOS-ESM/GEOS_Util) | [v2.0.8](https://github.com/GEOS-ESM/GEOS_Util/releases/tag/v2.0.8) | | [GEOSchem_GridComp](https://github.com/GEOS-ESM/GEOSchem_GridComp) | [v1.13.1](https://github.com/GEOS-ESM/GEOSchem_GridComp/releases/tag/v1.13.1) | | [GEOSgcm_App](https://github.com/GEOS-ESM/GEOSgcm_App) | [v2.3.2](https://github.com/GEOS-ESM/GEOSgcm_App/releases/tag/v2.3.2) | diff --git a/components.yaml b/components.yaml index e55fe42b..16f626b2 100644 --- a/components.yaml +++ b/components.yaml @@ -115,7 +115,7 @@ StratChem: GEOS_OceanGridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp remote: ../GEOS_OceanGridComp.git - branch: feature/mathomp4/fms-baselibs + tag: v3.0.0 develop: develop mom: From 5c9e238e1c6ca05ad9b4418777b5252db260d29b Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 7 Jun 2024 14:28:58 -0400 Subject: [PATCH 010/241] Update rad and rrtmgp --- README.md | 2 +- components.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 5972593a..95b5e4dc 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ | [MOM6](https://github.com/GEOS-ESM/MOM6) | [geos/v3.1](https://github.com/GEOS-ESM/MOM6/tree/geos/v3.1) | | [NCEP_Shared](https://github.com/GEOS-ESM/NCEP_Shared) | [v1.3.0](https://github.com/GEOS-ESM/NCEP_Shared/releases/tag/v1.3.0) | | [QuickChem](https://github.com/GEOS-ESM/QuickChem) | [v1.0.0](https://github.com/GEOS-ESM/QuickChem/releases/tag/v1.0.0) | -| [RRTMGP](https://github.com/GEOS-ESM/rte-rrtmgp) | [geos/v1.7+1.0.0](https://github.com/GEOS-ESM/rte-rrtmgp/releases/tag/geos%2Fv1.7%2B1.0.0) | +| [RRTMGP](https://github.com/GEOS-ESM/rte-rrtmgp) | [geos/v1.8+1.0.0](https://github.com/GEOS-ESM/rte-rrtmgp/releases/tag/geos%2Fv1.8%2B1.0.0) | | [SIS2](https://github.com/GEOS-ESM/SIS2) | [geos/v0.0.1](https://github.com/GEOS-ESM/SIS2/releases/tag/geos%2Fv0.0.1) | | [StratChem](https://github.com/GEOS-ESM/StratChem) | [v1.0.0](https://github.com/GEOS-ESM/StratChem/releases/tag/v1.0.0) | | [TR](https://github.com/GEOS-ESM/TR) | [v1.1.0](https://github.com/GEOS-ESM/TR/releases/tag/v1.1.0) | diff --git a/components.yaml b/components.yaml index 16f626b2..cf78aa5b 100644 --- a/components.yaml +++ b/components.yaml @@ -158,13 +158,13 @@ sis2: GEOSradiation_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSradiation_GridComp remote: ../GEOSradiation_GridComp.git - tag: GCMv12_rc2 + branch: feature/pnorris/OSR_per_band_instrumentation-merge-scott develop: feature/sdrabenh/gcm_v12-rc1 RRTMGP: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSradiation_GridComp/GEOS_RadiationShared/@RRTMGP remote: ../rte-rrtmgp.git - tag: geos/v1.7+1.0.0 + tag: geos/v1.8+1.0.0 develop: geos/develop sparse: ./config/RRTMGP.sparse From cb21c0144bb175415aaca947654c2efbcf2d1ac8 Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst Date: Mon, 10 Jun 2024 09:14:23 -0400 Subject: [PATCH 011/241] Hand-merge main into feature/sdrabenh/gcm_v12-rc1 --- components.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components.yaml b/components.yaml index 75a4a760..56647e19 100644 --- a/components.yaml +++ b/components.yaml @@ -5,13 +5,13 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v4.28.1 + tag: v4.29.0 develop: main cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v3.44.0 + tag: v3.45.2 develop: develop ecbuild: @@ -48,7 +48,7 @@ MAPL: FMS: local: ./src/Shared/@FMS remote: ../FMS.git - tag: geos/2019.01.02+noaff.8 + tag: geos/2019.01.02+noaff.10 develop: geos/release/2019.01 GEOSgcm_GridComp: @@ -91,7 +91,7 @@ geos-chem: GOCART: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@GOCART remote: ../GOCART.git - tag: sdr_v2.2.1.1 + tag: sdr_v2.2.1.2 develop: develop QuickChem: From 3a6cc309809c27989b8aa9096efbdc240e3038b8 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 10 Jun 2024 14:55:59 -0400 Subject: [PATCH 012/241] Update v12 radiation branch --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index cf78aa5b..c89f8fad 100644 --- a/components.yaml +++ b/components.yaml @@ -158,7 +158,7 @@ sis2: GEOSradiation_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSradiation_GridComp remote: ../GEOSradiation_GridComp.git - branch: feature/pnorris/OSR_per_band_instrumentation-merge-scott + branch: feature/sdrabenh/gcm_v12-rc1 develop: feature/sdrabenh/gcm_v12-rc1 RRTMGP: From 35b1644f05d8548ef0710e0f682f2b0d15cf92c6 Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst Date: Tue, 11 Jun 2024 09:34:37 -0400 Subject: [PATCH 013/241] change GEOSradiation_GridComp branch --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index dcd93e14..7544e115 100644 --- a/components.yaml +++ b/components.yaml @@ -158,7 +158,7 @@ sis2: GEOSradiation_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSradiation_GridComp remote: ../GEOSradiation_GridComp.git - branch: feature/pnorris/OSR_per_band_instrumentation-merge-scott + branch: feature/sdrabenh/gcm_v12-rc1 develop: feature/sdrabenh/gcm_v12-rc1 RRTMGP: From b595041cc8fc7e6c8312d88b6cf19c7355a78456 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 12 Jun 2024 09:34:18 -0400 Subject: [PATCH 014/241] Update FMS CMake target As we move to FMS in Baselibs, we shouldn't use the old `fms_r4` and `fms_r8` targets anymore as they are non-standard. Instead we move to `FMS::fms_r4` and `FMS::fms_r8`. --- CMakeLists.txt | 15 ++++++++++++--- src/Shared/CMakeLists.txt | 10 ---------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e8d19f9c..dc2d4cdb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -81,9 +81,18 @@ if (NOT Baselibs_FOUND) add_library(ZLIB::zlib ALIAS ZLIB::ZLIB) find_package(FMS REQUIRED COMPONENTS R4 R8) - # We need aliases due to historical reasons - add_library(fms_r4 ALIAS FMS::fms_r4) - add_library(fms_r8 ALIAS FMS::fms_r8) + + # 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. + option(FMS_BUILT_WITH_YAML "FMS was built with YAML" OFF) + if (FMS_BUILT_WITH_YAML) + # We use the same Findlibyaml.cmake that FMS uses + 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}) + endif () endif () diff --git a/src/Shared/CMakeLists.txt b/src/Shared/CMakeLists.txt index dbb6c28b..05d2c8d7 100644 --- a/src/Shared/CMakeLists.txt +++ b/src/Shared/CMakeLists.txt @@ -3,13 +3,3 @@ esma_add_subdirectories ( GMAO_Shared NCEP_Shared ) - -if (NOT FMS_FOUND) - message (STATUS "FMS library not found. Building FMS from source.") - # Special case - FMS is built twice with two - # different precisions. - esma_add_subdirectory (FMS RENAME fms_r4) - esma_add_subdirectory (FMS RENAME fms_r8) -else () - message (STATUS "FMS library found. Using FMS from ${FMS_DIR}") -endif () From d3b2c363891173d933d5f7070fbf70ac2247ee26 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 12 Jun 2024 11:28:58 -0400 Subject: [PATCH 015/241] Update to mom geos/5.1.0+2.1.0 --- README.md | 2 +- components.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index c7bb79b6..3a25b849 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ | [Icepack](https://github.com/GEOS-ESM/Icepack) | [geos/v0.3.0](https://github.com/GEOS-ESM/Icepack/releases/tag/geos%2Fv0.3.0) | | [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.46.1](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.46.1) | | [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+2.0.0](https://github.com/GEOS-ESM/MOM5/releases/tag/geos%2F5.1.0%2B2.0.0) | +| [MOM5](https://github.com/GEOS-ESM/MOM5) | [geos/5.1.0+2.1.0](https://github.com/GEOS-ESM/MOM5/releases/tag/geos%2F5.1.0%2B2.1.0) | | [MOM6](https://github.com/GEOS-ESM/MOM6) | [geos/v3.1](https://github.com/GEOS-ESM/MOM6/tree/geos/v3.1) | | [NCEP_Shared](https://github.com/GEOS-ESM/NCEP_Shared) | [v1.3.0](https://github.com/GEOS-ESM/NCEP_Shared/releases/tag/v1.3.0) | | [QuickChem](https://github.com/GEOS-ESM/QuickChem) | [v1.0.0](https://github.com/GEOS-ESM/QuickChem/releases/tag/v1.0.0) | diff --git a/components.yaml b/components.yaml index 7544e115..f058623a 100644 --- a/components.yaml +++ b/components.yaml @@ -10,7 +10,7 @@ env: cmake: local: ./@cmake - remote: ../ESMA_cmake.git + remote: ../ESMA_cmake.git tag: v4.0.0 develop: develop @@ -121,7 +121,7 @@ GEOS_OceanGridComp: mom: local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp/MOM_GEOS5PlugMod/@mom remote: ../MOM5.git - tag: geos/5.1.0+2.0.0 + tag: geos/5.1.0+2.1.0 develop: geos5 mom6: From b3f48275bda4f7e56d7cbd3aac704a1c1470f32b Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst Date: Wed, 12 Jun 2024 15:30:05 -0400 Subject: [PATCH 016/241] update to tag GCMv12_rc3 --- components.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/components.yaml b/components.yaml index 7544e115..128db882 100644 --- a/components.yaml +++ b/components.yaml @@ -36,38 +36,38 @@ GMAO_Shared: GEOS_Util: local: ./src/Shared/@GMAO_Shared/@GEOS_Util remote: ../GEOS_Util.git - tag: GCMv12_rc2 + tag: GCMv12_rc3 develop: feature/sdrabenh/gcm_v12-rc1 MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - tag: GCMv12_rc2 + tag: GCMv12_rc3 develop: feature/sdrabenh/gcm_v12-rc1 GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - tag: GCMv12_rc2 + tag: GCMv12_rc3 sparse: ./config/GEOSgcm_GridComp.sparse develop: feature/sdrabenh/gcm_v12-rc1 FVdycoreCubed_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp remote: ../FVdycoreCubed_GridComp.git - tag: GCMv12_rc2 + tag: GCMv12_rc3 develop: feature/sdrabenh/gcm_v12-rc1 fvdycore: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp/@fvdycore remote: ../GFDL_atmos_cubed_sphere.git - tag: feature/mathomp4/fms-baselibs-v12 + tag: GCMv12_rc3 develop: feature/sdrabenh/gcm_v12-rc1 GEOSchem_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp remote: ../GEOSchem_GridComp.git - tag: GCMv12_rc2 + tag: GCMv12_rc3 develop: feature/sdrabenh/gcm_v12-rc1 HEMCO: @@ -158,7 +158,7 @@ sis2: GEOSradiation_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSradiation_GridComp remote: ../GEOSradiation_GridComp.git - branch: feature/sdrabenh/gcm_v12-rc1 + tag: GCMv12_rc3 develop: feature/sdrabenh/gcm_v12-rc1 RRTMGP: @@ -183,7 +183,7 @@ umwm: GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git - tag: GCMv12_rc2 + tag: GCMv12_rc3 develop: feature/sdrabenh/gcm_v12-rc1 UMD_Etc: From a665d9466a2ba70c448a97faa179d32c00fb5de7 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 21 Jun 2024 10:08:36 -0400 Subject: [PATCH 017/241] Update ESMA_cmake to v4.1.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3a25b849..44f4dd46 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ | [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/v1.3.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv1.3.0) | -| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.0.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.0.0) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.1.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.1.0) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.0.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.0.0) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.11.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.11.1) | | [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) | diff --git a/components.yaml b/components.yaml index f058623a..329db154 100644 --- a/components.yaml +++ b/components.yaml @@ -11,7 +11,7 @@ env: cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v4.0.0 + tag: v4.1.0 develop: develop ecbuild: From f9b1e0d26a1cd51094f652840db774ff5f863b46 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 24 Jun 2024 13:13:46 -0400 Subject: [PATCH 018/241] Update to Ocean GC 3.1.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 44f4dd46..691ccfe3 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.0.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.0.0) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.11.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.11.1) | | [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) | -| [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v2.1.7](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v2.1.7) | +| [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v3.1.0](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v3.1.0) | | [GEOS_Util](https://github.com/GEOS-ESM/GEOS_Util) | [v2.0.8](https://github.com/GEOS-ESM/GEOS_Util/releases/tag/v2.0.8) | | [GEOSchem_GridComp](https://github.com/GEOS-ESM/GEOSchem_GridComp) | [v1.13.1](https://github.com/GEOS-ESM/GEOSchem_GridComp/releases/tag/v1.13.1) | | [GEOSgcm_App](https://github.com/GEOS-ESM/GEOSgcm_App) | [v2.3.3](https://github.com/GEOS-ESM/GEOSgcm_App/releases/tag/v2.3.3) | diff --git a/components.yaml b/components.yaml index 329db154..047ff950 100644 --- a/components.yaml +++ b/components.yaml @@ -115,7 +115,7 @@ StratChem: GEOS_OceanGridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp remote: ../GEOS_OceanGridComp.git - tag: v3.0.0 + tag: v3.1.0 develop: develop mom: From 11a11236b199ee023f605a0ae2e5692337b84c4f Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 8 Jul 2024 14:25:09 -0400 Subject: [PATCH 019/241] Update to Baselibs 8.4.0, Intel 2021.13 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 691ccfe3..c24f2310 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ | [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/v1.3.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv1.3.0) | | [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.1.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.1.0) | -| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.0.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.0.0) | +| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.2.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.2.0) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.11.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.11.1) | | [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) | | [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v3.1.0](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v3.1.0) | diff --git a/components.yaml b/components.yaml index 047ff950..4412362b 100644 --- a/components.yaml +++ b/components.yaml @@ -5,7 +5,7 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v5.0.0 + tag: v5.2.0 develop: main cmake: From 86ceeb64512964fe6118589ba524ceec1d934483 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 15 Jul 2024 10:59:48 -0400 Subject: [PATCH 020/241] Update to ESMA_cmake v4.2.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c24f2310..7c1c0f3a 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ | [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/v1.3.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv1.3.0) | -| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.1.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.1.0) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.2.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.2.0) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.2.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.2.0) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.11.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.11.1) | | [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) | diff --git a/components.yaml b/components.yaml index 4412362b..424586db 100644 --- a/components.yaml +++ b/components.yaml @@ -11,7 +11,7 @@ env: cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v4.1.0 + tag: v4.2.0 develop: develop ecbuild: From e0175a03d41beccccd900abfa80986c1c242bd84 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 15 Jul 2024 12:57:58 -0400 Subject: [PATCH 021/241] Update to ESMA_cmake v4.3.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7c1c0f3a..b03c261c 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ | [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/v1.3.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv1.3.0) | -| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.2.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.2.0) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.3.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.3.0) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.2.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.2.0) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.11.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.11.1) | | [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) | diff --git a/components.yaml b/components.yaml index 424586db..c8699b2c 100644 --- a/components.yaml +++ b/components.yaml @@ -11,7 +11,7 @@ env: cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v4.2.0 + tag: v4.3.0 develop: develop ecbuild: From 85d0354235e1402932ef67fc0e36e19375363a56 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 23 Jul 2024 09:29:52 -0400 Subject: [PATCH 022/241] Merge in latest from v12 rc1 branch --- components.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/components.yaml b/components.yaml index c8699b2c..6da5a46f 100644 --- a/components.yaml +++ b/components.yaml @@ -36,26 +36,26 @@ GMAO_Shared: GEOS_Util: local: ./src/Shared/@GMAO_Shared/@GEOS_Util remote: ../GEOS_Util.git - tag: GCMv12_rc2 + tag: GCMv12_rc3 develop: feature/sdrabenh/gcm_v12-rc1 MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - tag: GCMv12_rc2 + tag: GCMv12_rc3 develop: feature/sdrabenh/gcm_v12-rc1 GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - tag: GCMv12_rc2 + tag: GCMv12_rc3 sparse: ./config/GEOSgcm_GridComp.sparse develop: feature/sdrabenh/gcm_v12-rc1 FVdycoreCubed_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp remote: ../FVdycoreCubed_GridComp.git - tag: GCMv12_rc2 + tag: GCMv12_rc3 develop: feature/sdrabenh/gcm_v12-rc1 fvdycore: @@ -67,7 +67,7 @@ fvdycore: GEOSchem_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp remote: ../GEOSchem_GridComp.git - tag: GCMv12_rc2 + tag: GCMv12_rc3 develop: feature/sdrabenh/gcm_v12-rc1 HEMCO: @@ -158,7 +158,7 @@ sis2: GEOSradiation_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSradiation_GridComp remote: ../GEOSradiation_GridComp.git - branch: feature/sdrabenh/gcm_v12-rc1 + tag: GCMv12_rc3 develop: feature/sdrabenh/gcm_v12-rc1 RRTMGP: @@ -183,7 +183,7 @@ umwm: GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git - tag: GCMv12_rc2 + tag: GCMv12_rc3 develop: feature/sdrabenh/gcm_v12-rc1 UMD_Etc: From 96efb823a1bf1e4988133b61fa75652b49e2b311 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 23 Jul 2024 09:32:51 -0400 Subject: [PATCH 023/241] Update CI to Baselibs 8.5.0 --- .circleci/config.yml | 6 +++--- .github/workflows/workflow.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b644b11b..c95af55b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,7 +16,7 @@ parameters: # Anchors to prevent forgetting to update a version os_version: &os_version ubuntu20 -baselibs_version: &baselibs_version v8.0.2 +baselibs_version: &baselibs_version v8.5.0 bcs_version: &bcs_version v11.5.0 tag_build_arg_name: &tag_build_arg_name gcmversion @@ -84,9 +84,9 @@ workflows: bcs_version: *bcs_version container_name: geosgcm mpi_name: intelmpi - mpi_version: 2021.6.0 + mpi_version: "2021.13" compiler_name: intel - compiler_version: 2022.1.0 + compiler_version: "2024.2" image_name: geos-env-bcs tag_build_arg_name: *tag_build_arg_name resource_class: xlarge diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 5dd2230f..93a79113 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -19,7 +19,7 @@ jobs: if: "!contains(github.event.pull_request.labels.*.name, '0 diff trivial')" runs-on: ubuntu-latest container: - image: gmao/ubuntu20-geos-env:v8.0.2-intelmpi_2021.6.0-intel_2022.1.0 + image: gmao/ubuntu20-geos-env:v8.5.0-intelmpi_2021.13-intel_2024.2 # Per https://github.com/actions/virtual-environments/issues/1445#issuecomment-713861495 # It seems like we might not need secrets on GitHub Actions which is good for forked # pull requests From e62239df0b4d31e972141b5a0c78e270bf65c624 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 23 Jul 2024 09:33:40 -0400 Subject: [PATCH 024/241] Update to ESMA_env v5.3.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b03c261c..f6e325a3 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ | [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/v1.3.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv1.3.0) | | [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.3.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.3.0) | -| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.2.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.2.0) | +| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.3.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.3.0) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.11.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.11.1) | | [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) | | [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v3.1.0](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v3.1.0) | diff --git a/components.yaml b/components.yaml index 6da5a46f..37527fe6 100644 --- a/components.yaml +++ b/components.yaml @@ -5,7 +5,7 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v5.2.0 + tag: v5.3.0 develop: main cmake: From b8920fb88b25b854f9d7e274e8d84888a5de3062 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 1 Aug 2024 15:13:07 -0400 Subject: [PATCH 025/241] Update to match GEOSgcm main as of 2024-Aug-01 --- CHANGELOG.md | 72 +++++++++++++++++++++++++++++++++++++++++++++++++ CMakeLists.txt | 2 +- README.md | 16 +++++------ components.yaml | 6 ++--- 4 files changed, 84 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a100559d..c22fce6d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,78 @@ ## Unreleased +## [11.6.1] - 2024-08-01 + +### Zero-diff to Previous Release: YES +### Restart Changes: NO + +### Major Zero-Diff Changes: + +* `linkbcs` bugfix for coupled runs using v12 bcs [#623](https://github.com/GEOS-ESM/GEOSgcm_App/pull/623) +* Exports and `LONG_NAMES` changes for land water and energy balances [#957](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/957) +* New and renamed exports added to`HISTORY.rc.tmpl` for land water and energy balances [#621](https://github.com/GEOS-ESM/GEOSgcm_App/pull/621) +* Update GMI and StratChem HISTORY [#627](https://github.com/GEOS-ESM/GEOSgcm_App/pull/627) +* Routing Outlets in Boundary Conditions [#827](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/827) +* Bugfix to remove double-counting of heat corr (`StieglitzSnow.F90`) [#946](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/946) +* Bugfix whereby `TMPHIST` was not created during cloning [#626](https://github.com/GEOS-ESM/GEOSgcm_App/pull/626) +* Fixes for Ninja builds [#966](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/966) +* Added MASKFILE for time-discontinuous data for TEM diagnostics [#89](https://github.com/GEOS-ESM/GEOS_Util/pull/89) +* Add MOM6 C90 ogrid option to `remap_utils.py` [#83](https://github.com/GEOS-ESM/GEOS_Util/pull/83) +* Bugfix for `time_ave.rc` [#86](https://github.com/GEOS-ESM/GEOS_Util/pull/86) + +### Fixture Changes: +* ESMA_cmake [v3.45.2 => v3.48.0](https://github.com/GEOS-ESM/ESMA_cmake/compare/v3.45.2...v3.48.0) +* GMAO_Shared [v1.9.7 => v1.9.8](https://github.com/GEOS-ESM/GMAO_Shared/compare/v1.9.7...v1.9.8) +* GEOS_Util [v2.1.0 => v2.1.2](https://github.com/GEOS-ESM/GEOS_Util/compare/v2.1.0...v2.1.2) +* MAPL [v2.46.1 => v2.47.1](https://github.com/GEOS-ESM/MAPL/compare/v2.46.1...v2.47.1) +* GEOSgcm_GridComp [v2.6.0 => v2.6.1](https://github.com/GEOS-ESM/GEOSgcm_GridComp/compare/v2.6.0...v2.6.1) +* GEOSchem_GridComp [v1.13.1 => v1.14.0](https://github.com/GEOS-ESM/GEOSchem_GridComp/compare/v1.13.1...v1.14.0) +* TR [v1.1.0 => v1.2.0](https://github.com/GEOS-ESM/TR/compare/v1.1.0...v1.2.0) +* GMI [v1.1.0 => v1.3.0](https://github.com/GEOS-ESM/GMI/compare/v1.1.0...v1.3.0) +* GEOSgcm_App [v2.3.3 => v2.3.4](https://github.com/GEOS-ESM/GEOSgcm_App/compare/v2.3.3...v2.3.4) + + +## [11.6.0] - 2024-06-11 + +### Zero-diff to Previous Release: NO +### Restart Changes: NO (see details below) + + +## Potential non-zero-diff changes: +* Hotfix for uninitialized variables `tep` and `qp` when `wstar <= 0.001` [#931](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/931) +* `make_bcs` fix for bad HWSDv1.21 data in Argentina "peatland" [#944](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/944) + +## Zero-diff changes: +* Sync `qr`/`qs` export naming to corresponding changes in MOIST (exports) [#605](https://github.com/GEOS-ESM/GEOSgcm_App/pull/605) +* Moving to new BCS directory structure [#551](https://github.com/GEOS-ESM/GEOSgcm_App/pull/551) +* Additional cleanup of Stieglitz snow code [#813](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/813) +* Adding new v12 BCS option (Argentina "peatland" fix) [#616](https://github.com/GEOS-ESM/GEOSgcm_App/pull/616) [#75](https://github.com/GEOS-ESM/GEOS_Util/pull/75) +* Adding new v11 BCS option, new `linkbcs`, and changes in setup scripts [#544](https://github.com/GEOS-ESM/GEOSgcm_App/pull/544) +* CICE6 cmake and namelist updates for post release v6.5.0 merge [#925](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/925) +* Fix up stretched grid tags [#613](https://github.com/GEOS-ESM/GEOSgcm_App/pull/613) +* Fix aerosol HISTORY for FP [#595](https://github.com/GEOS-ESM/GEOSgcm_App/pull/595) +* Allow history to overwrite previously written output [#594](https://github.com/GEOS-ESM/GEOSgcm_App/pull/594) +* Plot updates for automated TEM Diagnostics [#76](https://github.com/GEOS-ESM/GEOS_Util/pull/76) +* Minor update to GMI and StratChem setup scripts [#599](https://github.com/GEOS-ESM/GEOSgcm_App/pull/599) +* Replaced Default `$HOMEDIR` pathway with user's `$NOBACKUP` inside `gcm_setup` [#591](https://github.com/GEOS-ESM/GEOSgcm_App/pull/591) +* Add Milan support at NAS [#607](https://github.com/GEOS-ESM/GEOSgcm_App/pull/607) +* Updates for running GEOSgcm with Spack as libraries instead of Baselibs [#611](https://github.com/GEOS-ESM/GEOSgcm_App/pull/611) +* Remove mask from `read_Reynolds` [#73](https://github.com/GEOS-ESM/GEOS_Util/pull/73) + +### Fixture Changes: +* ESMA_env [v4.25.1 => v4.29.0](https://github.com/GEOS-ESM/ESMA_env/compare/v4.25.1...v4.29.0) +* ESMA_cmake [v3.41.0 => v3.45.2](https://github.com/GEOS-ESM/ESMA_cmake/compare/v3.41.0...v3.45.2) +* GEOS_Util [v2.0.7 => v2.1.0](https://github.com/GEOS-ESM/GEOS_Util/compare/v2.0.7...v2.1.0) +* MAPL [v2.44.0 => v2.46.1](https://github.com/GEOS-ESM/MAPL/compare/v2.44.0...v2.46.1) +* FMS [2019.01.02+noaff.8 => 2019.01.02+noaff.10](https://github.com/GEOS-ESM/FMS/compare/geos/2019.01.02+noaff.8...geos/2019.01.02+noaff.10) +* GEOSgcm_GridComp [v2.5.2 => v2.6.0](https://github.com/GEOS-ESM/GEOSgcm_GridComp/compare/v2.5.2...v2.6.0) +* FVdycoreCubed_GridComp [v2.11.0 => v2.11.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/compare/v2.11.0...v2.11.1) +* fvdycore [v2.8.1 => v2.9.0](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere/compare/geos/v2.8.1...geos/v2.9.0) +* GOCART [sdr_v2.2.1.1 => sdr_v2.2.1.2](https://github.com/GEOS-ESM/GOCART/compare/sdr_v2.2.1.1...sdr_v2.2.1.2) +* CICE6 [v0.1.3 => v0.2.0](https://github.com/GEOS-ESM/CICE/compare/geos/v0.1.3...geos/v0.2.0) +* icepack [v0.2.0 => v0.3.0](https://github.com/GEOS-ESM/Icepack/compare/geos/v0.2.0...geos/v0.3.0) +* GEOSgcm_App [v2.3.2 => v2.3.3](https://github.com/GEOS-ESM/GEOSgcm_App/compare/v2.3.2...v2.3.3) + ## [11.5.2] - 2024-03-04 ### Zero-diff to Previous Release: YES diff --git a/CMakeLists.txt b/CMakeLists.txt index dc2d4cdb..6beee2c8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_policy (SET CMP0054 NEW) project ( GEOSgcm - VERSION 11.5.2 + VERSION 12.0.0 LANGUAGES Fortran CXX C) # Note - CXX is required for ESMF if ("${PROJECT_SOURCE_DIR}" STREQUAL "${PROJECT_BINARY_DIR}") diff --git a/README.md b/README.md index f6e325a3..37321be6 100644 --- a/README.md +++ b/README.md @@ -20,18 +20,18 @@ | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.11.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.11.1) | | [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) | | [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v3.1.0](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v3.1.0) | -| [GEOS_Util](https://github.com/GEOS-ESM/GEOS_Util) | [v2.0.8](https://github.com/GEOS-ESM/GEOS_Util/releases/tag/v2.0.8) | -| [GEOSchem_GridComp](https://github.com/GEOS-ESM/GEOSchem_GridComp) | [v1.13.1](https://github.com/GEOS-ESM/GEOSchem_GridComp/releases/tag/v1.13.1) | -| [GEOSgcm_App](https://github.com/GEOS-ESM/GEOSgcm_App) | [v2.3.3](https://github.com/GEOS-ESM/GEOSgcm_App/releases/tag/v2.3.3) | -| [GEOSgcm_GridComp](https://github.com/GEOS-ESM/GEOSgcm_GridComp) | [v2.6.0](https://github.com/GEOS-ESM/GEOSgcm_GridComp/releases/tag/v2.6.0) | +| [GEOS_Util](https://github.com/GEOS-ESM/GEOS_Util) | [v2.1.2](https://github.com/GEOS-ESM/GEOS_Util/releases/tag/v2.1.2) | +| [GEOSchem_GridComp](https://github.com/GEOS-ESM/GEOSchem_GridComp) | [v1.14.0](https://github.com/GEOS-ESM/GEOSchem_GridComp/releases/tag/v1.14.0) | +| [GEOSgcm_App](https://github.com/GEOS-ESM/GEOSgcm_App) | [v2.3.4](https://github.com/GEOS-ESM/GEOSgcm_App/releases/tag/v2.3.4) | +| [GEOSgcm_GridComp](https://github.com/GEOS-ESM/GEOSgcm_GridComp) | [v2.6.1](https://github.com/GEOS-ESM/GEOSgcm_GridComp/releases/tag/v2.6.1) | | [GEOSradiation_GridComp](https://github.com/GEOS-ESM/GEOSradiation_GridComp) | [v1.8.0](https://github.com/GEOS-ESM/GEOSradiation_GridComp/releases/tag/v1.8.0) | | [GFDL_atmos_cubed_sphere](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere) | [geos/v2.9.0](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere/releases/tag/geos%2Fv2.9.0) | -| [GMI](https://github.com/GEOS-ESM/GMI) | [v1.1.0](https://github.com/GEOS-ESM/GMI/releases/tag/v1.1.0) | -| [GMAO_Shared](https://github.com/GEOS-ESM/GMAO_Shared) | [v1.9.7](https://github.com/GEOS-ESM/GMAO_Shared/releases/tag/v1.9.7) | +| [GMI](https://github.com/GEOS-ESM/GMI) | [v1.3.0](https://github.com/GEOS-ESM/GMI/releases/tag/v1.3.0) | +| [GMAO_Shared](https://github.com/GEOS-ESM/GMAO_Shared) | [v1.9.8](https://github.com/GEOS-ESM/GMAO_Shared/releases/tag/v1.9.8) | | [GOCART](https://github.com/GEOS-ESM/GOCART) | [sdr_v2.2.1.2](https://github.com/GEOS-ESM/GOCART/releases/tag/sdr_v2.2.1.2) | | [HEMCO](https://github.com/GEOS-ESM/HEMCO) | [geos/v2.2.3](https://github.com/GEOS-ESM/HEMCO/releases/tag/geos%2Fv2.2.3) | | [Icepack](https://github.com/GEOS-ESM/Icepack) | [geos/v0.3.0](https://github.com/GEOS-ESM/Icepack/releases/tag/geos%2Fv0.3.0) | -| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.46.1](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.46.1) | +| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.47.1](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.47.1) | | [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+2.1.0](https://github.com/GEOS-ESM/MOM5/releases/tag/geos%2F5.1.0%2B2.1.0) | | [MOM6](https://github.com/GEOS-ESM/MOM6) | [geos/v3.1](https://github.com/GEOS-ESM/MOM6/tree/geos/v3.1) | @@ -40,7 +40,7 @@ | [RRTMGP](https://github.com/GEOS-ESM/rte-rrtmgp) | [geos/v1.8+1.0.0](https://github.com/GEOS-ESM/rte-rrtmgp/releases/tag/geos%2Fv1.8%2B1.0.0) | | [SIS2](https://github.com/GEOS-ESM/SIS2) | [geos/v0.0.1](https://github.com/GEOS-ESM/SIS2/releases/tag/geos%2Fv0.0.1) | | [StratChem](https://github.com/GEOS-ESM/StratChem) | [v1.0.0](https://github.com/GEOS-ESM/StratChem/releases/tag/v1.0.0) | -| [TR](https://github.com/GEOS-ESM/TR) | [v1.1.0](https://github.com/GEOS-ESM/TR/releases/tag/v1.1.0) | +| [TR](https://github.com/GEOS-ESM/TR) | [v1.2.0](https://github.com/GEOS-ESM/TR/releases/tag/v1.2.0) | | [UMD_Etc](https://github.com/GEOS-ESM/UMD_Etc) | [v1.3.0](https://github.com/GEOS-ESM/UMD_Etc/releases/tag/v1.3.0) | | [WW3](https://github.com/GEOS-ESM/WW3) | [v6.07.1-geos-r2](https://github.com/GEOS-ESM/WW3/releases/tag/v6.07.1-geos-r2) | | [umwm](https://github.com/GEOS-ESM/umwm) | [v2.0.0-geos-r1](https://github.com/GEOS-ESM/umwm/releases/tag/v2.0.0-geos-r1) | diff --git a/components.yaml b/components.yaml index 37527fe6..d3d9473c 100644 --- a/components.yaml +++ b/components.yaml @@ -29,7 +29,7 @@ NCEP_Shared: GMAO_Shared: local: ./src/Shared/@GMAO_Shared remote: ../GMAO_Shared.git - tag: v1.9.7 + tag: v1.9.8 sparse: ./config/GMAO_Shared.sparse develop: main @@ -97,13 +97,13 @@ QuickChem: TR: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@TR remote: ../TR.git - tag: v1.1.0 + tag: v1.2.0 develop: develop GMI: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@GMI remote: ../GMI.git - tag: v1.1.0 + tag: v1.3.0 develop: develop StratChem: From bdbd5e4db371f1e6e496d47769c574a6551a0468 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 1 Aug 2024 15:13:38 -0400 Subject: [PATCH 026/241] Update to ESMA_cmake v4.4.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 37321be6..90bcca8d 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ | [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/v1.3.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv1.3.0) | -| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.3.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.3.0) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.4.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.4.0) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.3.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.3.0) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.11.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.11.1) | | [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) | diff --git a/components.yaml b/components.yaml index d3d9473c..78d813f7 100644 --- a/components.yaml +++ b/components.yaml @@ -11,7 +11,7 @@ env: cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v4.3.0 + tag: v4.4.0 develop: develop ecbuild: From 1d88366d5acb38d890863cbfeab01a9b4dfcacd0 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 12 Aug 2024 15:32:08 -0400 Subject: [PATCH 027/241] Update to ESMA_cmake v4.5.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 90bcca8d..407f541b 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ | [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/v1.3.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv1.3.0) | -| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.4.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.4.0) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.5.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.5.0) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.3.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.3.0) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.11.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.11.1) | | [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) | diff --git a/components.yaml b/components.yaml index 78d813f7..408016ab 100644 --- a/components.yaml +++ b/components.yaml @@ -11,7 +11,7 @@ env: cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v4.4.0 + tag: v4.5.0 develop: develop ecbuild: From 31d1e02689f12a54c19e6c29593b00273f063b88 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 21 Aug 2024 08:13:14 -0400 Subject: [PATCH 028/241] Update to MOM6 geos/v3.2 and Ocean GC v3.3.0 --- README.md | 4 ++-- components.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 407f541b..908998b1 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.3.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.3.0) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.11.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.11.1) | | [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) | -| [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v3.1.0](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v3.1.0) | +| [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v3.3.0](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v3.3.0) | | [GEOS_Util](https://github.com/GEOS-ESM/GEOS_Util) | [v2.1.2](https://github.com/GEOS-ESM/GEOS_Util/releases/tag/v2.1.2) | | [GEOSchem_GridComp](https://github.com/GEOS-ESM/GEOSchem_GridComp) | [v1.14.0](https://github.com/GEOS-ESM/GEOSchem_GridComp/releases/tag/v1.14.0) | | [GEOSgcm_App](https://github.com/GEOS-ESM/GEOSgcm_App) | [v2.3.4](https://github.com/GEOS-ESM/GEOSgcm_App/releases/tag/v2.3.4) | @@ -34,7 +34,7 @@ | [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.47.1](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.47.1) | | [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+2.1.0](https://github.com/GEOS-ESM/MOM5/releases/tag/geos%2F5.1.0%2B2.1.0) | -| [MOM6](https://github.com/GEOS-ESM/MOM6) | [geos/v3.1](https://github.com/GEOS-ESM/MOM6/tree/geos/v3.1) | +| [MOM6](https://github.com/GEOS-ESM/MOM6) | [geos/v3.2](https://github.com/GEOS-ESM/MOM6/tree/geos/v3.2) | | [NCEP_Shared](https://github.com/GEOS-ESM/NCEP_Shared) | [v1.3.0](https://github.com/GEOS-ESM/NCEP_Shared/releases/tag/v1.3.0) | | [QuickChem](https://github.com/GEOS-ESM/QuickChem) | [v1.0.0](https://github.com/GEOS-ESM/QuickChem/releases/tag/v1.0.0) | | [RRTMGP](https://github.com/GEOS-ESM/rte-rrtmgp) | [geos/v1.8+1.0.0](https://github.com/GEOS-ESM/rte-rrtmgp/releases/tag/geos%2Fv1.8%2B1.0.0) | diff --git a/components.yaml b/components.yaml index 408016ab..435da9aa 100644 --- a/components.yaml +++ b/components.yaml @@ -115,7 +115,7 @@ StratChem: GEOS_OceanGridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp remote: ../GEOS_OceanGridComp.git - tag: v3.1.0 + tag: v3.3.0 develop: develop mom: @@ -127,7 +127,7 @@ mom: mom6: local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp/MOM6_GEOSPlug/@mom6 remote: ../MOM6.git - tag: geos/v3.1 + tag: geos/v3.2 develop: main recurse_submodules: true From 142ca75173ce86cbaa4cd2dc0a036fecc693a3ef Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 26 Aug 2024 09:49:45 -0400 Subject: [PATCH 029/241] Update to MOM6 geos/v3.3 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 908998b1..59b51a79 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ | [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.47.1](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.47.1) | | [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+2.1.0](https://github.com/GEOS-ESM/MOM5/releases/tag/geos%2F5.1.0%2B2.1.0) | -| [MOM6](https://github.com/GEOS-ESM/MOM6) | [geos/v3.2](https://github.com/GEOS-ESM/MOM6/tree/geos/v3.2) | +| [MOM6](https://github.com/GEOS-ESM/MOM6) | [geos/v3.3](https://github.com/GEOS-ESM/MOM6/tree/geos/v3.3) | | [NCEP_Shared](https://github.com/GEOS-ESM/NCEP_Shared) | [v1.3.0](https://github.com/GEOS-ESM/NCEP_Shared/releases/tag/v1.3.0) | | [QuickChem](https://github.com/GEOS-ESM/QuickChem) | [v1.0.0](https://github.com/GEOS-ESM/QuickChem/releases/tag/v1.0.0) | | [RRTMGP](https://github.com/GEOS-ESM/rte-rrtmgp) | [geos/v1.8+1.0.0](https://github.com/GEOS-ESM/rte-rrtmgp/releases/tag/geos%2Fv1.8%2B1.0.0) | diff --git a/components.yaml b/components.yaml index 48f60543..f94d18e4 100644 --- a/components.yaml +++ b/components.yaml @@ -127,7 +127,7 @@ mom: mom6: local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp/MOM6_GEOSPlug/@mom6 remote: ../MOM6.git - tag: geos/v3.2 + tag: geos/v3.3 develop: main recurse_submodules: true From d2d90cd7e532385f2c2fcd38b9545edec8bf79e6 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 5 Sep 2024 10:23:36 -0400 Subject: [PATCH 030/241] Update to ESMA_cmake v4.6.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 59b51a79..d2907368 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ | [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/v1.3.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv1.3.0) | -| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.5.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.5.0) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.6.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.6.0) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.3.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.3.0) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.11.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.11.1) | | [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) | diff --git a/components.yaml b/components.yaml index f94d18e4..5e89777d 100644 --- a/components.yaml +++ b/components.yaml @@ -11,7 +11,7 @@ env: cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v4.5.0 + tag: v4.6.0 develop: develop ecbuild: From c0dfbce4a30fa9078adc44490349f66125f02b3a Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 9 Sep 2024 10:29:32 -0400 Subject: [PATCH 031/241] Update to ESMA_env v5.3.1 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d2907368..811182e2 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ | [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/v1.3.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv1.3.0) | | [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.6.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.6.0) | -| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.3.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.3.0) | +| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.3.1](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.3.1) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.11.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.11.1) | | [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) | | [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v3.3.0](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v3.3.0) | diff --git a/components.yaml b/components.yaml index 5e89777d..22db398d 100644 --- a/components.yaml +++ b/components.yaml @@ -5,7 +5,7 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v5.3.0 + tag: v5.3.1 develop: main cmake: From 15ef530a8f4c3869bd08227becaccddffcb867a0 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 9 Sep 2024 14:26:39 -0400 Subject: [PATCH 032/241] Update to Orb 5 with v12 BCs --- .circleci/config.yml | 38 ++++++++++++++++++++++++++-------- .github/workflows/workflow.yml | 2 +- 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c95af55b..b16f37ad 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -17,11 +17,12 @@ parameters: # Anchors to prevent forgetting to update a version os_version: &os_version ubuntu20 baselibs_version: &baselibs_version v8.5.0 -bcs_version: &bcs_version v11.5.0 +bcs_version: &bcs_version v12.0.0 tag_build_arg_name: &tag_build_arg_name gcmversion orbs: - ci: geos-esm/circleci-tools@3 + ci: geos-esm/circleci-tools@dev:9428a6bb28aa2f1623927873a863dcd381d55bd0 + #ci: geos-esm/circleci-tools@5 workflows: build-test: @@ -45,11 +46,11 @@ workflows: matrix: parameters: compiler: [gfortran, ifort] - baselibs_version: *baselibs_version - bcs_version: *bcs_version requires: - build-GEOSgcm-on-<< matrix.compiler >> repo: GEOSgcm + baselibs_version: *baselibs_version + bcs_version: *bcs_version # Run Coupled GCM (1 hour, no ExtData) - ci/run_gcm: @@ -59,11 +60,11 @@ workflows: matrix: parameters: compiler: [ifort] - baselibs_version: *baselibs_version - bcs_version: *bcs_version requires: - build-GEOSgcm-on-<< matrix.compiler >> repo: GEOSgcm + baselibs_version: *baselibs_version + bcs_version: *bcs_version gcm_ocean_type: MOM6 change_layout: false @@ -75,7 +76,7 @@ workflows: filters: tags: only: /^v.*$/ - name: publish-intel-docker-image + name: publish-ifort-docker-image context: - docker-hub-creds - ghcr-creds @@ -85,11 +86,30 @@ workflows: container_name: geosgcm mpi_name: intelmpi mpi_version: "2021.13" - compiler_name: intel - compiler_version: "2024.2" + compiler_name: ifort + compiler_version: "2021.13" image_name: geos-env-bcs tag_build_arg_name: *tag_build_arg_name resource_class: xlarge + #- ci/publish_docker: + #filters: + #tags: + #only: /^v.*$/ + #name: publish-ifx-docker-image + #context: + #- docker-hub-creds + #- ghcr-creds + #os_version: *os_version + #baselibs_version: *baselibs_version + #bcs_version: *bcs_version + #container_name: geosgcm + #mpi_name: intelmpi + #mpi_version: "2021.13" + #compiler_name: ifx + #compiler_version: "2024.2" + #image_name: geos-env-bcs + #tag_build_arg_name: *tag_build_arg_name + #resource_class: xlarge - ci/publish_docker: filters: tags: diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 93a79113..8170549a 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -19,7 +19,7 @@ jobs: if: "!contains(github.event.pull_request.labels.*.name, '0 diff trivial')" runs-on: ubuntu-latest container: - image: gmao/ubuntu20-geos-env:v8.5.0-intelmpi_2021.13-intel_2024.2 + image: gmao/ubuntu20-geos-env:v8.5.0-intelmpi_2021.13-ifort_2021.13-bcs_v12.0.0 # Per https://github.com/actions/virtual-environments/issues/1445#issuecomment-713861495 # It seems like we might not need secrets on GitHub Actions which is good for forked # pull requests From 31741c0998838fa0828cf15918b42c3418bb03d4 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 9 Sep 2024 15:09:28 -0400 Subject: [PATCH 033/241] Add landbcs_type option for coupled run --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b16f37ad..69cc891c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,7 +21,7 @@ bcs_version: &bcs_version v12.0.0 tag_build_arg_name: &tag_build_arg_name gcmversion orbs: - ci: geos-esm/circleci-tools@dev:9428a6bb28aa2f1623927873a863dcd381d55bd0 + ci: geos-esm/circleci-tools@dev:f0c2c8ef70b5b840bbd8e08f6fabaa9f7bb4d5d4 #ci: geos-esm/circleci-tools@5 workflows: @@ -66,6 +66,7 @@ workflows: baselibs_version: *baselibs_version bcs_version: *bcs_version gcm_ocean_type: MOM6 + landbcs_type: NL3 change_layout: false build-and-publish-docker: From 5bc98820ebba0c3145c40dbf3c350196cafcd91f Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 10 Sep 2024 08:17:14 -0400 Subject: [PATCH 034/241] Move to CI Orb v5 --- .circleci/config.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 69cc891c..b9229633 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,8 +21,7 @@ bcs_version: &bcs_version v12.0.0 tag_build_arg_name: &tag_build_arg_name gcmversion orbs: - ci: geos-esm/circleci-tools@dev:f0c2c8ef70b5b840bbd8e08f6fabaa9f7bb4d5d4 - #ci: geos-esm/circleci-tools@5 + ci: geos-esm/circleci-tools@5 workflows: build-test: From c8995eba6f22aaededb494e11561fdb6d67943c8 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 18 Sep 2024 11:06:09 -0400 Subject: [PATCH 035/241] Update to ESMA_env v5.4.1 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 811182e2..199893ce 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ | [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/v1.3.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv1.3.0) | | [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.6.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.6.0) | -| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.3.1](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.3.1) | +| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.4.1](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.4.1) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.11.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.11.1) | | [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) | | [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v3.3.0](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v3.3.0) | diff --git a/components.yaml b/components.yaml index 22db398d..03c21dfb 100644 --- a/components.yaml +++ b/components.yaml @@ -5,7 +5,7 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v5.3.1 + tag: v5.4.1 develop: main cmake: From 414eac5309be2a55ee747f322e2f25126162116e Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 26 Sep 2024 11:42:52 -0400 Subject: [PATCH 036/241] Update CI --- .circleci/config.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b9229633..0147a487 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,7 +16,7 @@ parameters: # Anchors to prevent forgetting to update a version os_version: &os_version ubuntu20 -baselibs_version: &baselibs_version v8.5.0 +baselibs_version: &baselibs_version v8.6.0 bcs_version: &bcs_version v12.0.0 tag_build_arg_name: &tag_build_arg_name gcmversion @@ -65,7 +65,6 @@ workflows: baselibs_version: *baselibs_version bcs_version: *bcs_version gcm_ocean_type: MOM6 - landbcs_type: NL3 change_layout: false build-and-publish-docker: From ceea75704a2f10ccdcdb952cf386f612a0e83b36 Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst Date: Mon, 7 Oct 2024 17:02:04 -0400 Subject: [PATCH 037/241] Uptick to pre-release tag GCMv12-rc5 --- components.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/components.yaml b/components.yaml index 03c21dfb..63de7c5e 100644 --- a/components.yaml +++ b/components.yaml @@ -17,7 +17,7 @@ cmake: ecbuild: local: ./@cmake/@ecbuild remote: ../ecbuild.git - tag: geos/v1.3.0 + tag: geos/v1.4.0 NCEP_Shared: local: ./src/Shared/@NCEP_Shared @@ -29,45 +29,45 @@ NCEP_Shared: GMAO_Shared: local: ./src/Shared/@GMAO_Shared remote: ../GMAO_Shared.git - tag: GCMv12_rc4 + tag: GCMv12-rc5 sparse: ./config/GMAO_Shared.sparse develop: feature/sdrabenh/gcm_v12 GEOS_Util: local: ./src/Shared/@GMAO_Shared/@GEOS_Util remote: ../GEOS_Util.git - tag: GCMv12_rc4 + tag: GCMv12-rc5 develop: feature/sdrabenh/gcm_v12 MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - tag: GCMv12_rc4 + tag: GCMv12-rc5 develop: feature/sdrabenh/gcm_v12 GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - tag: GCMv12_rc4 + tag: GCMv12-rc5 sparse: ./config/GEOSgcm_GridComp.sparse develop: feature/sdrabenh/gcm_v12 FVdycoreCubed_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp remote: ../FVdycoreCubed_GridComp.git - tag: GCMv12_rc4 + tag: GCMv12-rc5 develop: feature/sdrabenh/gcm_v12 fvdycore: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp/@fvdycore remote: ../GFDL_atmos_cubed_sphere.git - tag: GCMv12_rc4 + tag: GCMv12-rc5 develop: feature/sdrabenh/gcm_v12 GEOSchem_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp remote: ../GEOSchem_GridComp.git - tag: GCMv12_rc4 + tag: GCMv12-rc5 develop: feature/sdrabenh/gcm_v12 HEMCO: @@ -158,7 +158,7 @@ sis2: GEOSradiation_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSradiation_GridComp remote: ../GEOSradiation_GridComp.git - tag: GCMv12_rc4 + tag: GCMv12-rc5 develop: feature/sdrabenh/gcm_v12 RRTMGP: @@ -183,7 +183,7 @@ umwm: GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git - tag: GCMv12_rc4 + tag: GCMv12-rc5 develop: feature/sdrabenh/gcm_v12 UMD_Etc: From a785c60c7170a30718ed834afe7b0f1c11dd64bf Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 10 Oct 2024 11:32:19 -0400 Subject: [PATCH 038/241] v12: Add ability to use MAPL as a library --- .github/workflows/release-tarball.yml | 14 +++++++++----- CMakeLists.txt | 5 +++++ README.md | 2 +- components.yaml | 2 +- src/Shared/CMakeLists.txt | 8 +++++++- 5 files changed, 23 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release-tarball.yml b/.github/workflows/release-tarball.yml index 3866b8dd..38537d28 100644 --- a/.github/workflows/release-tarball.yml +++ b/.github/workflows/release-tarball.yml @@ -14,16 +14,20 @@ jobs: with: path: ${{ github.event.repository.name }}-${{ github.event.release.tag_name }} - - name: Checkout mepo - uses: actions/checkout@v4 + - name: Setup Python + uses: actions/setup-python@v5 with: - repository: GEOS-ESM/mepo - path: mepo + python-version: '3.11' + + - name: Pip install mepo + run: | + python -m pip install --upgrade pip + pip install mepo - name: Run mepo run : | cd ${GITHUB_WORKSPACE}/${{ github.event.repository.name }}-${{ github.event.release.tag_name }} - ${GITHUB_WORKSPACE}/mepo/mepo clone + mepo clone - name: Create tarball run: | diff --git a/CMakeLists.txt b/CMakeLists.txt index 6beee2c8..8c544305 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -94,6 +94,11 @@ if (NOT Baselibs_FOUND) target_link_libraries(FMS::fms_r8 INTERFACE ${LIBYAML_LIBRARIES}) endif () + find_package(MAPL 2.49 QUIET) + if (MAPL_FOUND) + message(STATUS "Found MAPL: ${MAPL_BASE_DIR} (found version \"${MAPL_VERSION})\"") + endif () + endif () ecbuild_declare_project() diff --git a/README.md b/README.md index 199893ce..e19e392a 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ | [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/v1.3.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv1.3.0) | -| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.6.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.6.0) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.7.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.7.0) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.4.1](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.4.1) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.11.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.11.1) | | [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) | diff --git a/components.yaml b/components.yaml index 63de7c5e..3de61692 100644 --- a/components.yaml +++ b/components.yaml @@ -11,7 +11,7 @@ env: cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v4.6.0 + tag: v4.7.0 develop: develop ecbuild: diff --git a/src/Shared/CMakeLists.txt b/src/Shared/CMakeLists.txt index 05d2c8d7..d4103f58 100644 --- a/src/Shared/CMakeLists.txt +++ b/src/Shared/CMakeLists.txt @@ -1,5 +1,11 @@ esma_add_subdirectories ( - MAPL GMAO_Shared NCEP_Shared ) + +if (NOT MAPL_FOUND) + message (STATUS "External MAPL library not found. Building MAPL from source.") + esma_add_subdirectory (MAPL) +else () + message (STATUS "MAPL library found. Using MAPL from ${MAPL_BASE_DIR}") +endif () \ No newline at end of file From 69575c4080cba4b307aefd2892c4c157920f0eb2 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 10 Oct 2024 11:34:27 -0400 Subject: [PATCH 039/241] Add comment --- components.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/components.yaml b/components.yaml index 3de61692..171e55af 100644 --- a/components.yaml +++ b/components.yaml @@ -39,6 +39,8 @@ GEOS_Util: tag: GCMv12-rc5 develop: feature/sdrabenh/gcm_v12 +# When updating the MAPL version, also update the MAPL version in the +# CMakeLists.txt file for non-Baselibs builds MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git From b79b4f80f24a0c496b7f373fbf4de871914f412b Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 21 Oct 2024 09:23:42 -0400 Subject: [PATCH 040/241] Update to MAPL 2.50.1 --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8c544305..f142e434 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.17) +cmake_minimum_required (VERSION 3.23) cmake_policy (SET CMP0053 NEW) cmake_policy (SET CMP0054 NEW) @@ -94,7 +94,7 @@ if (NOT Baselibs_FOUND) target_link_libraries(FMS::fms_r8 INTERFACE ${LIBYAML_LIBRARIES}) endif () - find_package(MAPL 2.49 QUIET) + find_package(MAPL 2.50 QUIET) if (MAPL_FOUND) message(STATUS "Found MAPL: ${MAPL_BASE_DIR} (found version \"${MAPL_VERSION})\"") endif () From 7830c1b67ccb87d8e7179f89171b0d3cac99bceb Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 21 Oct 2024 09:41:04 -0400 Subject: [PATCH 041/241] Update to MAPL 2.50.1 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e19e392a..50b8d23f 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ | [GOCART](https://github.com/GEOS-ESM/GOCART) | [sdr_v2.2.1.2](https://github.com/GEOS-ESM/GOCART/releases/tag/sdr_v2.2.1.2) | | [HEMCO](https://github.com/GEOS-ESM/HEMCO) | [geos/v2.2.3](https://github.com/GEOS-ESM/HEMCO/releases/tag/geos%2Fv2.2.3) | | [Icepack](https://github.com/GEOS-ESM/Icepack) | [geos/v0.3.0](https://github.com/GEOS-ESM/Icepack/releases/tag/geos%2Fv0.3.0) | -| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.47.1](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.47.1) | +| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.50.1](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.50.1) | | [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+2.1.0](https://github.com/GEOS-ESM/MOM5/releases/tag/geos%2F5.1.0%2B2.1.0) | | [MOM6](https://github.com/GEOS-ESM/MOM6) | [geos/v3.3](https://github.com/GEOS-ESM/MOM6/tree/geos/v3.3) | From 853fb15d76eacd2cc4b71aabbe0496fd43d4c3a1 Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst Date: Mon, 21 Oct 2024 11:39:26 -0400 Subject: [PATCH 042/241] Uptick to pre-release GCMv12-rc6 --- components.yaml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/components.yaml b/components.yaml index 171e55af..1f387baa 100644 --- a/components.yaml +++ b/components.yaml @@ -29,14 +29,14 @@ NCEP_Shared: GMAO_Shared: local: ./src/Shared/@GMAO_Shared remote: ../GMAO_Shared.git - tag: GCMv12-rc5 + tag: GCMv12-rc6 sparse: ./config/GMAO_Shared.sparse develop: feature/sdrabenh/gcm_v12 GEOS_Util: local: ./src/Shared/@GMAO_Shared/@GEOS_Util remote: ../GEOS_Util.git - tag: GCMv12-rc5 + tag: GCMv12-rc6 develop: feature/sdrabenh/gcm_v12 # When updating the MAPL version, also update the MAPL version in the @@ -44,32 +44,32 @@ GEOS_Util: MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - tag: GCMv12-rc5 + tag: GCMv12-rc6 develop: feature/sdrabenh/gcm_v12 GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - tag: GCMv12-rc5 + tag: GCMv12-rc6 sparse: ./config/GEOSgcm_GridComp.sparse develop: feature/sdrabenh/gcm_v12 FVdycoreCubed_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp remote: ../FVdycoreCubed_GridComp.git - tag: GCMv12-rc5 + tag: GCMv12-rc6 develop: feature/sdrabenh/gcm_v12 fvdycore: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp/@fvdycore remote: ../GFDL_atmos_cubed_sphere.git - tag: GCMv12-rc5 + tag: GCMv12-rc6 develop: feature/sdrabenh/gcm_v12 GEOSchem_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp remote: ../GEOSchem_GridComp.git - tag: GCMv12-rc5 + tag: GCMv12-rc6 develop: feature/sdrabenh/gcm_v12 HEMCO: @@ -87,8 +87,8 @@ geos-chem: GOCART: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@GOCART remote: ../GOCART.git - tag: sdr_v2.2.1.2 - develop: develop + tag: GCMv12-rc6 + develop: feature/sdrabenh/gcm_v12 QuickChem: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@QuickChem @@ -160,7 +160,7 @@ sis2: GEOSradiation_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSradiation_GridComp remote: ../GEOSradiation_GridComp.git - tag: GCMv12-rc5 + tag: GCMv12-rc6 develop: feature/sdrabenh/gcm_v12 RRTMGP: @@ -185,7 +185,7 @@ umwm: GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git - tag: GCMv12-rc5 + tag: GCMv12-rc6 develop: feature/sdrabenh/gcm_v12 UMD_Etc: From e1b38b288b2fe3e082d8c7383ef7986ea3799dca Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 22 Oct 2024 14:42:45 -0400 Subject: [PATCH 043/241] Update to Baselibs 8.7.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 50b8d23f..e1b8f904 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ | [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/v1.3.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv1.3.0) | | [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.7.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.7.0) | -| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.4.1](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.4.1) | +| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.5.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.5.0) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.11.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.11.1) | | [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) | | [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v3.3.0](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v3.3.0) | diff --git a/components.yaml b/components.yaml index 1f387baa..505439c4 100644 --- a/components.yaml +++ b/components.yaml @@ -5,7 +5,7 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v5.4.1 + tag: v5.5.0 develop: main cmake: From dc7e4ed635305ce9ca7766f779f74dfa479530d8 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 6 Nov 2024 08:16:47 -0500 Subject: [PATCH 044/241] Update to ESMA_env v5.5.1 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e1b8f904..066c1e4e 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ | [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/v1.3.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv1.3.0) | | [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.7.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.7.0) | -| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.5.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.5.0) | +| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.5.1](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.5.1) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.11.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.11.1) | | [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) | | [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v3.3.0](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v3.3.0) | diff --git a/components.yaml b/components.yaml index 505439c4..a9b85f00 100644 --- a/components.yaml +++ b/components.yaml @@ -5,7 +5,7 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v5.5.0 + tag: v5.5.1 develop: main cmake: From 4f5c164234459dbd7572d04f8ce4f77e6567ce8c Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 13 Nov 2024 11:23:16 -0500 Subject: [PATCH 045/241] Update to ESMA_cmake v4.9.0 --- .circleci/config.yml | 2 +- .github/workflows/workflow.yml | 2 +- README.md | 2 +- components.yaml | 2 +- parallel_build.csh | 5 +++-- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0147a487..b1d95e42 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,7 +16,7 @@ parameters: # Anchors to prevent forgetting to update a version os_version: &os_version ubuntu20 -baselibs_version: &baselibs_version v8.6.0 +baselibs_version: &baselibs_version v8.7.0 bcs_version: &bcs_version v12.0.0 tag_build_arg_name: &tag_build_arg_name gcmversion diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 8170549a..eb891d2c 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -19,7 +19,7 @@ jobs: if: "!contains(github.event.pull_request.labels.*.name, '0 diff trivial')" runs-on: ubuntu-latest container: - image: gmao/ubuntu20-geos-env:v8.5.0-intelmpi_2021.13-ifort_2021.13-bcs_v12.0.0 + image: gmao/ubuntu20-geos-env:v8.7.0-intelmpi_2021.13-ifort_2021.13-bcs_v12.0.0 # Per https://github.com/actions/virtual-environments/issues/1445#issuecomment-713861495 # It seems like we might not need secrets on GitHub Actions which is good for forked # pull requests diff --git a/README.md b/README.md index 066c1e4e..fa41f484 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ | [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/v1.3.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv1.3.0) | -| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.7.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.7.0) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.9.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.9.0) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.5.1](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.5.1) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.11.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.11.1) | | [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) | diff --git a/components.yaml b/components.yaml index a9b85f00..d01e8dd6 100644 --- a/components.yaml +++ b/components.yaml @@ -11,7 +11,7 @@ env: cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v4.7.0 + tag: v4.9.0 develop: develop ecbuild: diff --git a/parallel_build.csh b/parallel_build.csh index e32c2668..c8219d3b 100755 --- a/parallel_build.csh +++ b/parallel_build.csh @@ -35,6 +35,7 @@ if (-d ${ESMADIR}/@env || -d ${ESMADIR}/env@ || -d ${ESMADIR}/env) then echo "Checking out development branches of GEOSgcm_GridComp, GEOSgcm_App, GMAO_Shared, and GEOS_Util" mepo develop GEOSgcm_GridComp GEOSgcm_App GMAO_Shared GEOS_Util endif + mepo status else if ($?PBS_JOBID || $?SLURM_JOBID) then echo " mepo clone must be run!" @@ -42,13 +43,13 @@ else echo " Please run from a head node" exit 1 else - echo "Running mepo initialization" - mepo init + echo "Running mepo clone" mepo clone if ( "$DEVELOP" == "TRUE" ) then echo "Checking out development branches of GEOSgcm_GridComp, GEOSgcm_App, GMAO_Shared, and GEOS_Util" mepo develop GEOSgcm_GridComp GEOSgcm_App GMAO_Shared GEOS_Util endif + mepo status endif endif From 5bfda8aa7aa8bb95e07b7e387955b71fd3aed110 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 13 Nov 2024 11:25:46 -0500 Subject: [PATCH 046/241] Move to GCC 14 in CI --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b1d95e42..5b1e8f5d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -122,9 +122,9 @@ workflows: bcs_version: *bcs_version container_name: geosgcm mpi_name: openmpi - mpi_version: 5.0.2 + mpi_version: 5.0.5 compiler_name: gcc - compiler_version: 13.2.0 + compiler_version: 14.2.0 image_name: geos-env-bcs tag_build_arg_name: *tag_build_arg_name resource_class: xlarge From 18311d394253e64c31d90ce5caabe95775dd75e7 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 20 Nov 2024 08:48:10 -0500 Subject: [PATCH 047/241] Turn on ifx for GEOSgcm --- .circleci/config.yml | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5b1e8f5d..d597fc06 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -32,7 +32,7 @@ workflows: - docker-hub-creds matrix: parameters: - compiler: [ifort, gfortran] + compiler: [gfortran, ifort, ifx] baselibs_version: *baselibs_version repo: GEOSgcm persist_workspace: true # Needs to be true to run fv3/gcm experiment, costs extra @@ -44,7 +44,7 @@ workflows: - docker-hub-creds matrix: parameters: - compiler: [gfortran, ifort] + compiler: [gfortran, ifort, ifx] requires: - build-GEOSgcm-on-<< matrix.compiler >> repo: GEOSgcm @@ -58,7 +58,7 @@ workflows: - docker-hub-creds matrix: parameters: - compiler: [ifort] + compiler: [ifort, ifx] requires: - build-GEOSgcm-on-<< matrix.compiler >> repo: GEOSgcm @@ -90,25 +90,25 @@ workflows: image_name: geos-env-bcs tag_build_arg_name: *tag_build_arg_name resource_class: xlarge - #- ci/publish_docker: - #filters: - #tags: - #only: /^v.*$/ - #name: publish-ifx-docker-image - #context: - #- docker-hub-creds - #- ghcr-creds - #os_version: *os_version - #baselibs_version: *baselibs_version - #bcs_version: *bcs_version - #container_name: geosgcm - #mpi_name: intelmpi - #mpi_version: "2021.13" - #compiler_name: ifx - #compiler_version: "2024.2" - #image_name: geos-env-bcs - #tag_build_arg_name: *tag_build_arg_name - #resource_class: xlarge + - ci/publish_docker: + filters: + tags: + only: /^v.*$/ + name: publish-ifx-docker-image + context: + - docker-hub-creds + - ghcr-creds + os_version: *os_version + baselibs_version: *baselibs_version + bcs_version: *bcs_version + container_name: geosgcm + mpi_name: intelmpi + mpi_version: "2021.14" + compiler_name: ifx + compiler_version: "2025.0" + image_name: geos-env-bcs + tag_build_arg_name: *tag_build_arg_name + resource_class: xlarge - ci/publish_docker: filters: tags: From 0b65f42c53ac508dff08d0b963b92593f62e7292 Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst Date: Tue, 26 Nov 2024 08:46:19 -0500 Subject: [PATCH 048/241] Uptick to v12 pre-release 7 --- components.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components.yaml b/components.yaml index 1f387baa..11463ee4 100644 --- a/components.yaml +++ b/components.yaml @@ -50,20 +50,20 @@ MAPL: GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - tag: GCMv12-rc6 + tag: GCMv12-rc7 sparse: ./config/GEOSgcm_GridComp.sparse develop: feature/sdrabenh/gcm_v12 FVdycoreCubed_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp remote: ../FVdycoreCubed_GridComp.git - tag: GCMv12-rc6 + tag: GCMv12-rc7 develop: feature/sdrabenh/gcm_v12 fvdycore: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp/@fvdycore remote: ../GFDL_atmos_cubed_sphere.git - tag: GCMv12-rc6 + tag: GCMv12-rc7 develop: feature/sdrabenh/gcm_v12 GEOSchem_GridComp: @@ -87,7 +87,7 @@ geos-chem: GOCART: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@GOCART remote: ../GOCART.git - tag: GCMv12-rc6 + tag: GCMv12-rc7 develop: feature/sdrabenh/gcm_v12 QuickChem: From 764404b2de0071ea2f72bf88f8b32237ba4f635d Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 2 Dec 2024 14:03:00 -0500 Subject: [PATCH 049/241] Update to ESMA_cmake v4.10.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index fa41f484..866b2479 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ | [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/v1.3.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv1.3.0) | -| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.9.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.9.0) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.10.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.10.0) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.5.1](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.5.1) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.11.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.11.1) | | [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) | diff --git a/components.yaml b/components.yaml index 2f3f2baa..8b74d888 100644 --- a/components.yaml +++ b/components.yaml @@ -11,7 +11,7 @@ env: cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v4.9.0 + tag: v4.10.0 develop: develop ecbuild: From cdb2ddb09ef888c1c2bb2f514daf4e12aebe2470 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 2 Dec 2024 14:05:32 -0500 Subject: [PATCH 050/241] Update cmake minimum version to 3.24 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f142e434..7be3905b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.23) +cmake_minimum_required (VERSION 3.24) cmake_policy (SET CMP0053 NEW) cmake_policy (SET CMP0054 NEW) From e1679e41d3b2619c532e123177a6af4b7cfe92bf Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 3 Dec 2024 12:02:08 -0500 Subject: [PATCH 051/241] Turn off ifx coupled --- .circleci/config.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d597fc06..4732021e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -52,13 +52,16 @@ workflows: bcs_version: *bcs_version # Run Coupled GCM (1 hour, no ExtData) + # NOTE: Both gfortran and ifx seem to have + # issues with the Debug build of MOM6. For + # now, we only test on ifort - ci/run_gcm: name: run-coupled-GCM-on-<< matrix.compiler >> context: - docker-hub-creds matrix: parameters: - compiler: [ifort, ifx] + compiler: [ifort] requires: - build-GEOSgcm-on-<< matrix.compiler >> repo: GEOSgcm From 5b359b417daa31e9f02f01555488fbf6ea467ad9 Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst Date: Fri, 13 Dec 2024 09:41:07 -0500 Subject: [PATCH 052/241] Uptick prerelease to GCMv12-rc8 --- components.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/components.yaml b/components.yaml index 8b74d888..cb19051d 100644 --- a/components.yaml +++ b/components.yaml @@ -29,14 +29,14 @@ NCEP_Shared: GMAO_Shared: local: ./src/Shared/@GMAO_Shared remote: ../GMAO_Shared.git - tag: GCMv12-rc6 + tag: GCMv12-rc8 sparse: ./config/GMAO_Shared.sparse develop: feature/sdrabenh/gcm_v12 GEOS_Util: local: ./src/Shared/@GMAO_Shared/@GEOS_Util remote: ../GEOS_Util.git - tag: GCMv12-rc6 + tag: GCMv12-rc8 develop: feature/sdrabenh/gcm_v12 # When updating the MAPL version, also update the MAPL version in the @@ -44,13 +44,13 @@ GEOS_Util: MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - tag: GCMv12-rc6 + tag: GCMv12-rc8 develop: feature/sdrabenh/gcm_v12 GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - tag: GCMv12-rc7 + tag: GCMv12-rc8 sparse: ./config/GEOSgcm_GridComp.sparse develop: feature/sdrabenh/gcm_v12 @@ -63,13 +63,13 @@ FVdycoreCubed_GridComp: fvdycore: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp/@fvdycore remote: ../GFDL_atmos_cubed_sphere.git - tag: GCMv12-rc7 + tag: GCMv12-rc8 develop: feature/sdrabenh/gcm_v12 GEOSchem_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp remote: ../GEOSchem_GridComp.git - tag: GCMv12-rc6 + tag: GCMv12-rc8 develop: feature/sdrabenh/gcm_v12 HEMCO: @@ -87,7 +87,7 @@ geos-chem: GOCART: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@GOCART remote: ../GOCART.git - tag: GCMv12-rc7 + tag: GCMv12-rc8 develop: feature/sdrabenh/gcm_v12 QuickChem: @@ -185,7 +185,7 @@ umwm: GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git - tag: GCMv12-rc6 + tag: GCMv12-rc8 develop: feature/sdrabenh/gcm_v12 UMD_Etc: From 83c9784f98865375933ad63bce9c113f499b85fa Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst Date: Fri, 20 Dec 2024 14:32:46 -0500 Subject: [PATCH 053/241] Uptick to GCMv12-rc9 --- components.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/components.yaml b/components.yaml index cb19051d..4401b698 100644 --- a/components.yaml +++ b/components.yaml @@ -50,26 +50,26 @@ MAPL: GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - tag: GCMv12-rc8 + tag: GCMv12-rc9 sparse: ./config/GEOSgcm_GridComp.sparse develop: feature/sdrabenh/gcm_v12 FVdycoreCubed_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp remote: ../FVdycoreCubed_GridComp.git - tag: GCMv12-rc7 + tag: GCMv12-rc9 develop: feature/sdrabenh/gcm_v12 fvdycore: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp/@fvdycore remote: ../GFDL_atmos_cubed_sphere.git - tag: GCMv12-rc8 + tag: GCMv12-rc9 develop: feature/sdrabenh/gcm_v12 GEOSchem_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp remote: ../GEOSchem_GridComp.git - tag: GCMv12-rc8 + tag: GCMv12-rc9 develop: feature/sdrabenh/gcm_v12 HEMCO: @@ -160,7 +160,7 @@ sis2: GEOSradiation_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSradiation_GridComp remote: ../GEOSradiation_GridComp.git - tag: GCMv12-rc6 + tag: GCMv12-rc9 develop: feature/sdrabenh/gcm_v12 RRTMGP: @@ -185,7 +185,7 @@ umwm: GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git - tag: GCMv12-rc8 + tag: GCMv12-rc9 develop: feature/sdrabenh/gcm_v12 UMD_Etc: From a20921edd20d0e82d7cd5fde64d47548acfee8ad Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst Date: Fri, 20 Dec 2024 21:44:50 -0500 Subject: [PATCH 054/241] Uptick to GCMv12-rc10 --- components.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components.yaml b/components.yaml index 4401b698..e837750d 100644 --- a/components.yaml +++ b/components.yaml @@ -50,14 +50,14 @@ MAPL: GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - tag: GCMv12-rc9 + tag: GCMv12-rc10 sparse: ./config/GEOSgcm_GridComp.sparse develop: feature/sdrabenh/gcm_v12 FVdycoreCubed_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp remote: ../FVdycoreCubed_GridComp.git - tag: GCMv12-rc9 + tag: GCMv12-rc10 develop: feature/sdrabenh/gcm_v12 fvdycore: @@ -69,7 +69,7 @@ fvdycore: GEOSchem_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp remote: ../GEOSchem_GridComp.git - tag: GCMv12-rc9 + tag: GCMv12-rc10 develop: feature/sdrabenh/gcm_v12 HEMCO: From 7c38d0b811d4cd79c63a9910963532f8b8631ff2 Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst Date: Wed, 25 Dec 2024 16:52:46 -0500 Subject: [PATCH 055/241] Uptick to GCMv12-rc10 again --- components.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components.yaml b/components.yaml index e837750d..1fca0119 100644 --- a/components.yaml +++ b/components.yaml @@ -160,7 +160,7 @@ sis2: GEOSradiation_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSradiation_GridComp remote: ../GEOSradiation_GridComp.git - tag: GCMv12-rc9 + tag: GCMv12-rc10 develop: feature/sdrabenh/gcm_v12 RRTMGP: @@ -185,7 +185,7 @@ umwm: GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git - tag: GCMv12-rc9 + tag: GCMv12-rc10 develop: feature/sdrabenh/gcm_v12 UMD_Etc: From 574eb4069a25eb2bb6e39b7aed49f95c98282a49 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 3 Jan 2025 11:06:04 -0500 Subject: [PATCH 056/241] v12: Update to ESMA_cmake v4.11.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 866b2479..4fa08117 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ | [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/v1.3.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv1.3.0) | -| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.10.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.10.0) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.11.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.11.0) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.5.1](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.5.1) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.11.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.11.1) | | [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) | diff --git a/components.yaml b/components.yaml index 1fca0119..54cb3d7f 100644 --- a/components.yaml +++ b/components.yaml @@ -11,7 +11,7 @@ env: cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v4.10.0 + tag: v4.11.0 develop: develop ecbuild: From 7e904d9e6b7bdcb92e86de746739ef92a8ef4938 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 6 Jan 2025 12:19:41 -0500 Subject: [PATCH 057/241] v12: Update to ESMA_env v5.6.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4fa08117..78e71f95 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ | [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/v1.3.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv1.3.0) | | [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.11.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.11.0) | -| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.5.1](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.5.1) | +| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.6.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.6.0) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.11.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.11.1) | | [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) | | [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v3.3.0](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v3.3.0) | diff --git a/components.yaml b/components.yaml index 54cb3d7f..3ccf5317 100644 --- a/components.yaml +++ b/components.yaml @@ -5,7 +5,7 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v5.5.1 + tag: v5.6.0 develop: main cmake: From 07739aa0fdcdfd8f51647afccf5775e4f25fc27d Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 6 Jan 2025 12:20:56 -0500 Subject: [PATCH 058/241] Move to Ubuntu 24 --- .circleci/config.yml | 2 +- .github/workflows/workflow.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4732021e..46320ca4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,7 +15,7 @@ parameters: default: "" # Anchors to prevent forgetting to update a version -os_version: &os_version ubuntu20 +os_version: &os_version ubuntu24 baselibs_version: &baselibs_version v8.7.0 bcs_version: &bcs_version v12.0.0 tag_build_arg_name: &tag_build_arg_name gcmversion diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index eb891d2c..98847b4a 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -19,7 +19,7 @@ jobs: if: "!contains(github.event.pull_request.labels.*.name, '0 diff trivial')" runs-on: ubuntu-latest container: - image: gmao/ubuntu20-geos-env:v8.7.0-intelmpi_2021.13-ifort_2021.13-bcs_v12.0.0 + image: gmao/ubuntu24-geos-env:v8.7.0-intelmpi_2021.13-ifort_2021.13-bcs_v12.0.0 # Per https://github.com/actions/virtual-environments/issues/1445#issuecomment-713861495 # It seems like we might not need secrets on GitHub Actions which is good for forked # pull requests From 33ef1d624baafbd8fc5e61d744cf6b42f9d32b91 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 6 Jan 2025 12:22:28 -0500 Subject: [PATCH 059/241] Update readme to more modern CMake --- README.md | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 78e71f95..51d752e4 100644 --- a/README.md +++ b/README.md @@ -255,24 +255,39 @@ source @env/g5_modules.sh ``` ##### Create Build Directory -We currently do not allow in-source builds of GEOSgcm. So we must make a directory: -``` -mkdir build -``` -The advantages of this is that you can build both a Debug and Release version with the same clone if desired. ##### Run CMake -CMake generates the Makefiles needed to build the model. + +CMake generates the Makefiles needed to build the model. This command: ``` -cd build -cmake .. -DBASEDIR=$BASEDIR/Linux -DCMAKE_Fortran_COMPILER=ifort -DCMAKE_INSTALL_PREFIX=../install +cmake -B build -S . -DCMAKE_INSTALL_PREFIX=install ``` -This will install to a directory parallel to your `build` directory. If you prefer to install elsewhere change the path in: + +As is, this command assumes you are in the root of the GEOSgcm checkout and will create a `build/` directory in the root of the checkout and install into `install/ parallel to the `build/` directory. + +This command has three options: + +1. `-B` specifies the build directory. +2. `-S` specifies the source directory (root of the checkout). +3. `-DCMAKE_INSTALL_PREFIX` specifies the installation directory. + +If you prefer to install elsewhere change the path in: + ``` --DCMAKE_INSTALL_PREFIX= +-DCMAKE_INSTALL_PREFIX=/path/to/install ``` and CMake will install there. +If you prefer your build somewhere else, you can specify that with: +``` +-B /path/to/build +``` + +Finally, if your source is in a different directory than the current one, you can specify that with: +``` +-S /path/to/source +``` + ###### Create and install source tarfile Note that running with `parallel_build.csh` will create and install a tarfile of the source code at build time. But if CMake is run by hand, this is not the default action (as many who build with CMake by hand are developers and not often running experiments). In order to enable this at install time, add: @@ -283,7 +298,7 @@ to your CMake command. ##### Build and Install with Make ``` -make -jN install +cmake --build build -j N ``` where `N` is the number of parallel processes. On discover head nodes, this should only be as high as 2 due to limits on the head nodes. On a compute node, you can set `N` has high as you like, though 8-12 is about the limit of parallelism in our model's make system. @@ -291,7 +306,7 @@ where `N` is the number of parallel processes. On discover head nodes, this shou Once the model has built successfully, you will have an `install/` directory in your checkout. To run `gcm_setup` go to the `install/bin/` directory and run it there: ``` -cd install/bin +cd /path/to/install/bin ./gcm_setup ``` From 15cb0a2980c6637501cf2f5ffa4e97320dcb85ce Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 6 Jan 2025 14:11:10 -0500 Subject: [PATCH 060/241] Update to GEOSradiation_GridComp GCMv12-rc10b --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index 3ccf5317..2c81f545 100644 --- a/components.yaml +++ b/components.yaml @@ -160,7 +160,7 @@ sis2: GEOSradiation_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSradiation_GridComp remote: ../GEOSradiation_GridComp.git - tag: GCMv12-rc10 + tag: GCMv12-rc10b develop: feature/sdrabenh/gcm_v12 RRTMGP: From 011a6c10775cae88b9c7132d88d48637ae6a0c1f Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 16 Jan 2025 13:21:01 -0500 Subject: [PATCH 061/241] Update to ESMA_env v5.7.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 51d752e4..4a3666a8 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ | [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/v1.3.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv1.3.0) | | [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.11.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.11.0) | -| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.6.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.6.0) | +| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.7.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.7.0) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.11.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.11.1) | | [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) | | [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v3.3.0](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v3.3.0) | diff --git a/components.yaml b/components.yaml index 2c81f545..0940a972 100644 --- a/components.yaml +++ b/components.yaml @@ -5,7 +5,7 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v5.6.0 + tag: v5.7.0 develop: main cmake: From b74b7ca1ba3849d31a0f8ee18f2956dc26419f34 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 21 Jan 2025 12:06:59 -0500 Subject: [PATCH 062/241] v12: Update to HEMCO geos/v2.3.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 866b2479..67851e9c 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ | [GMI](https://github.com/GEOS-ESM/GMI) | [v1.3.0](https://github.com/GEOS-ESM/GMI/releases/tag/v1.3.0) | | [GMAO_Shared](https://github.com/GEOS-ESM/GMAO_Shared) | [v1.9.8](https://github.com/GEOS-ESM/GMAO_Shared/releases/tag/v1.9.8) | | [GOCART](https://github.com/GEOS-ESM/GOCART) | [sdr_v2.2.1.2](https://github.com/GEOS-ESM/GOCART/releases/tag/sdr_v2.2.1.2) | -| [HEMCO](https://github.com/GEOS-ESM/HEMCO) | [geos/v2.2.3](https://github.com/GEOS-ESM/HEMCO/releases/tag/geos%2Fv2.2.3) | +| [HEMCO](https://github.com/GEOS-ESM/HEMCO) | [geos/v2.3.0](https://github.com/GEOS-ESM/HEMCO/releases/tag/geos%2Fv2.3.0) | | [Icepack](https://github.com/GEOS-ESM/Icepack) | [geos/v0.3.0](https://github.com/GEOS-ESM/Icepack/releases/tag/geos%2Fv0.3.0) | | [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.50.1](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.50.1) | | [MITgcm](https://github.com/GEOS-ESM/MITgcm) | [checkpoint68o](https://github.com/GEOS-ESM/MITgcm/releases/tag/checkpoint68o) | diff --git a/components.yaml b/components.yaml index 1fca0119..3a43a692 100644 --- a/components.yaml +++ b/components.yaml @@ -75,7 +75,7 @@ GEOSchem_GridComp: HEMCO: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/Shared/HEMCO/@HEMCO remote: ../HEMCO.git - tag: geos/v2.2.3 + tag: geos/v2.3.0 develop: geos/develop geos-chem: From e14fb05ba814d6ab7ad774a033ea12b80df3d4e1 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 21 Jan 2025 12:07:29 -0500 Subject: [PATCH 063/241] Undo last commit. Meant to do PR --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 67851e9c..866b2479 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ | [GMI](https://github.com/GEOS-ESM/GMI) | [v1.3.0](https://github.com/GEOS-ESM/GMI/releases/tag/v1.3.0) | | [GMAO_Shared](https://github.com/GEOS-ESM/GMAO_Shared) | [v1.9.8](https://github.com/GEOS-ESM/GMAO_Shared/releases/tag/v1.9.8) | | [GOCART](https://github.com/GEOS-ESM/GOCART) | [sdr_v2.2.1.2](https://github.com/GEOS-ESM/GOCART/releases/tag/sdr_v2.2.1.2) | -| [HEMCO](https://github.com/GEOS-ESM/HEMCO) | [geos/v2.3.0](https://github.com/GEOS-ESM/HEMCO/releases/tag/geos%2Fv2.3.0) | +| [HEMCO](https://github.com/GEOS-ESM/HEMCO) | [geos/v2.2.3](https://github.com/GEOS-ESM/HEMCO/releases/tag/geos%2Fv2.2.3) | | [Icepack](https://github.com/GEOS-ESM/Icepack) | [geos/v0.3.0](https://github.com/GEOS-ESM/Icepack/releases/tag/geos%2Fv0.3.0) | | [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.50.1](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.50.1) | | [MITgcm](https://github.com/GEOS-ESM/MITgcm) | [checkpoint68o](https://github.com/GEOS-ESM/MITgcm/releases/tag/checkpoint68o) | diff --git a/components.yaml b/components.yaml index 3a43a692..1fca0119 100644 --- a/components.yaml +++ b/components.yaml @@ -75,7 +75,7 @@ GEOSchem_GridComp: HEMCO: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/Shared/HEMCO/@HEMCO remote: ../HEMCO.git - tag: geos/v2.3.0 + tag: geos/v2.2.3 develop: geos/develop geos-chem: From 1f75a38cb8e45a41e91d95719a79997f68105466 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 21 Jan 2025 12:08:35 -0500 Subject: [PATCH 064/241] v12: Update to HEMCO geos/v2.3.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 866b2479..67851e9c 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ | [GMI](https://github.com/GEOS-ESM/GMI) | [v1.3.0](https://github.com/GEOS-ESM/GMI/releases/tag/v1.3.0) | | [GMAO_Shared](https://github.com/GEOS-ESM/GMAO_Shared) | [v1.9.8](https://github.com/GEOS-ESM/GMAO_Shared/releases/tag/v1.9.8) | | [GOCART](https://github.com/GEOS-ESM/GOCART) | [sdr_v2.2.1.2](https://github.com/GEOS-ESM/GOCART/releases/tag/sdr_v2.2.1.2) | -| [HEMCO](https://github.com/GEOS-ESM/HEMCO) | [geos/v2.2.3](https://github.com/GEOS-ESM/HEMCO/releases/tag/geos%2Fv2.2.3) | +| [HEMCO](https://github.com/GEOS-ESM/HEMCO) | [geos/v2.3.0](https://github.com/GEOS-ESM/HEMCO/releases/tag/geos%2Fv2.3.0) | | [Icepack](https://github.com/GEOS-ESM/Icepack) | [geos/v0.3.0](https://github.com/GEOS-ESM/Icepack/releases/tag/geos%2Fv0.3.0) | | [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.50.1](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.50.1) | | [MITgcm](https://github.com/GEOS-ESM/MITgcm) | [checkpoint68o](https://github.com/GEOS-ESM/MITgcm/releases/tag/checkpoint68o) | diff --git a/components.yaml b/components.yaml index 1fca0119..3a43a692 100644 --- a/components.yaml +++ b/components.yaml @@ -75,7 +75,7 @@ GEOSchem_GridComp: HEMCO: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/Shared/HEMCO/@HEMCO remote: ../HEMCO.git - tag: geos/v2.2.3 + tag: geos/v2.3.0 develop: geos/develop geos-chem: From aa17d0cc9fbc0850507854ff3d52c7d2541cb985 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 21 Jan 2025 14:52:52 -0500 Subject: [PATCH 065/241] Update to GCMv12-rc10b for rad ifx fix --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index 3a43a692..582cea96 100644 --- a/components.yaml +++ b/components.yaml @@ -69,7 +69,7 @@ fvdycore: GEOSchem_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp remote: ../GEOSchem_GridComp.git - tag: GCMv12-rc10 + tag: GCMv12-rc10b develop: feature/sdrabenh/gcm_v12 HEMCO: From 3860e7b776a04f79a1dfd391cd1eab8427d3c509 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 22 Jan 2025 08:52:13 -0500 Subject: [PATCH 066/241] Update to GCMv12-rc10b for rad ifx fix and not chem --- components.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components.yaml b/components.yaml index 582cea96..36d5920f 100644 --- a/components.yaml +++ b/components.yaml @@ -69,7 +69,7 @@ fvdycore: GEOSchem_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp remote: ../GEOSchem_GridComp.git - tag: GCMv12-rc10b + tag: GCMv12-rc10 develop: feature/sdrabenh/gcm_v12 HEMCO: @@ -160,7 +160,7 @@ sis2: GEOSradiation_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSradiation_GridComp remote: ../GEOSradiation_GridComp.git - tag: GCMv12-rc10 + tag: GCMv12-rc10b develop: feature/sdrabenh/gcm_v12 RRTMGP: From cd51635728b65e0f0017393d6ee2427407652f6f Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 22 Jan 2025 10:25:01 -0500 Subject: [PATCH 067/241] v12: Update to ESMA_env v5.7.1 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4a3666a8..91dc63f8 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ | [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/v1.3.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv1.3.0) | | [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.11.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.11.0) | -| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.7.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.7.0) | +| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.7.1](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.7.1) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.11.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.11.1) | | [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) | | [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v3.3.0](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v3.3.0) | diff --git a/components.yaml b/components.yaml index 0940a972..be179711 100644 --- a/components.yaml +++ b/components.yaml @@ -5,7 +5,7 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v5.7.0 + tag: v5.7.1 develop: main cmake: From 59bfd5acf4783baefbb8a148ae9071a5bfef527f Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 27 Jan 2025 09:55:45 -0500 Subject: [PATCH 068/241] v12: Update to MOM6 geos/v3.4 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 866b2479..4419d671 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ | [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.50.1](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.50.1) | | [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+2.1.0](https://github.com/GEOS-ESM/MOM5/releases/tag/geos%2F5.1.0%2B2.1.0) | -| [MOM6](https://github.com/GEOS-ESM/MOM6) | [geos/v3.3](https://github.com/GEOS-ESM/MOM6/tree/geos/v3.3) | +| [MOM6](https://github.com/GEOS-ESM/MOM6) | [geos/v3.4](https://github.com/GEOS-ESM/MOM6/tree/geos/v3.4) | | [NCEP_Shared](https://github.com/GEOS-ESM/NCEP_Shared) | [v1.3.0](https://github.com/GEOS-ESM/NCEP_Shared/releases/tag/v1.3.0) | | [QuickChem](https://github.com/GEOS-ESM/QuickChem) | [v1.0.0](https://github.com/GEOS-ESM/QuickChem/releases/tag/v1.0.0) | | [RRTMGP](https://github.com/GEOS-ESM/rte-rrtmgp) | [geos/v1.8+1.0.0](https://github.com/GEOS-ESM/rte-rrtmgp/releases/tag/geos%2Fv1.8%2B1.0.0) | diff --git a/components.yaml b/components.yaml index 1fca0119..3dfd2ecf 100644 --- a/components.yaml +++ b/components.yaml @@ -129,7 +129,7 @@ mom: mom6: local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp/MOM6_GEOSPlug/@mom6 remote: ../MOM6.git - tag: geos/v3.3 + tag: geos/v3.4 develop: main recurse_submodules: true From 8d056b7ff7f568dfd609d36f482d536a478a8ff5 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 28 Jan 2025 12:52:49 -0500 Subject: [PATCH 069/241] Update to latest CI --- .circleci/config.yml | 2 +- .github/workflows/workflow.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 46320ca4..346c5048 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,7 +16,7 @@ parameters: # Anchors to prevent forgetting to update a version os_version: &os_version ubuntu24 -baselibs_version: &baselibs_version v8.7.0 +baselibs_version: &baselibs_version v8.9.0 bcs_version: &bcs_version v12.0.0 tag_build_arg_name: &tag_build_arg_name gcmversion diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 98847b4a..57454e9a 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -19,7 +19,7 @@ jobs: if: "!contains(github.event.pull_request.labels.*.name, '0 diff trivial')" runs-on: ubuntu-latest container: - image: gmao/ubuntu24-geos-env:v8.7.0-intelmpi_2021.13-ifort_2021.13-bcs_v12.0.0 + image: gmao/ubuntu24-geos-env:v8.9.0-intelmpi_2021.13-ifort_2021.13-bcs_v12.0.0 # Per https://github.com/actions/virtual-environments/issues/1445#issuecomment-713861495 # It seems like we might not need secrets on GitHub Actions which is good for forked # pull requests From 586ada2d860f1bae2494f5f22504cbc334a669e9 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 28 Jan 2025 14:36:24 -0500 Subject: [PATCH 070/241] Fixes for Spack --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7be3905b..caab61bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -82,6 +82,10 @@ if (NOT Baselibs_FOUND) find_package(FMS REQUIRED COMPONENTS R4 R8) + # These aliases should be removed once the CMake in subrepos is fixed + add_library(fms_r4 ALIAS FMS::fms_r4) + add_library(fms_r8 ALIAS FMS::fms_r8) + # 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. option(FMS_BUILT_WITH_YAML "FMS was built with YAML" OFF) From ecd6288ac3fe480230088345168cdb7f5c0ea234 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 28 Jan 2025 14:37:27 -0500 Subject: [PATCH 071/241] Undo fixes for spack. Not enough --- CMakeLists.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index caab61bb..7be3905b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -82,10 +82,6 @@ if (NOT Baselibs_FOUND) find_package(FMS REQUIRED COMPONENTS R4 R8) - # These aliases should be removed once the CMake in subrepos is fixed - add_library(fms_r4 ALIAS FMS::fms_r4) - add_library(fms_r8 ALIAS FMS::fms_r8) - # 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. option(FMS_BUILT_WITH_YAML "FMS was built with YAML" OFF) From 067c4ab552bac9a2d3f9141faea8cd86e01df44e Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 6 Feb 2025 08:01:09 -0500 Subject: [PATCH 072/241] Fix ifx and irrad --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index 3dfd2ecf..080aa97a 100644 --- a/components.yaml +++ b/components.yaml @@ -160,7 +160,7 @@ sis2: GEOSradiation_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSradiation_GridComp remote: ../GEOSradiation_GridComp.git - tag: GCMv12-rc10 + tag: GCMv12-rc10b develop: feature/sdrabenh/gcm_v12 RRTMGP: From fd9160a1d5c5be4e46bcb61a9f8325d57ce51ed8 Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst Date: Tue, 11 Feb 2025 10:27:18 -0500 Subject: [PATCH 073/241] uptick hemco --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index 1fca0119..3a43a692 100644 --- a/components.yaml +++ b/components.yaml @@ -75,7 +75,7 @@ GEOSchem_GridComp: HEMCO: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/Shared/HEMCO/@HEMCO remote: ../HEMCO.git - tag: geos/v2.2.3 + tag: geos/v2.3.0 develop: geos/develop geos-chem: From 114c8a64dc164acee58482db849e627a93da5350 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 11 Feb 2025 16:45:14 -0500 Subject: [PATCH 074/241] Update to ESMA_cmake v4.12.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 91dc63f8..652107ec 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ | [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/v1.3.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv1.3.0) | -| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.11.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.11.0) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.12.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.12.0) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.7.1](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.7.1) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.11.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.11.1) | | [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) | diff --git a/components.yaml b/components.yaml index be179711..5b1d3e51 100644 --- a/components.yaml +++ b/components.yaml @@ -11,7 +11,7 @@ env: cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v4.11.0 + tag: v4.12.0 develop: develop ecbuild: From fb76b53853d6a1e1b8053e8d5903b0bc372d5a7f Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 12 Feb 2025 09:03:33 -0500 Subject: [PATCH 075/241] Update CI --- .circleci/config.yml | 2 +- .github/workflows/workflow.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 346c5048..7bc743c5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,7 +16,7 @@ parameters: # Anchors to prevent forgetting to update a version os_version: &os_version ubuntu24 -baselibs_version: &baselibs_version v8.9.0 +baselibs_version: &baselibs_version v8.12.0 bcs_version: &bcs_version v12.0.0 tag_build_arg_name: &tag_build_arg_name gcmversion diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 57454e9a..245ba747 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -19,7 +19,7 @@ jobs: if: "!contains(github.event.pull_request.labels.*.name, '0 diff trivial')" runs-on: ubuntu-latest container: - image: gmao/ubuntu24-geos-env:v8.9.0-intelmpi_2021.13-ifort_2021.13-bcs_v12.0.0 + image: gmao/ubuntu24-geos-env:v8.12.0-intelmpi_2021.13-ifort_2021.13-bcs_v12.0.0 # Per https://github.com/actions/virtual-environments/issues/1445#issuecomment-713861495 # It seems like we might not need secrets on GitHub Actions which is good for forked # pull requests From 634d4396bed256acd4e86fee0ed41067ec6088c2 Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst Date: Wed, 12 Feb 2025 11:24:47 -0500 Subject: [PATCH 076/241] Uptick to tag GCMv12-rc11 --- components.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/components.yaml b/components.yaml index edb761be..321f6a33 100644 --- a/components.yaml +++ b/components.yaml @@ -36,7 +36,7 @@ GMAO_Shared: GEOS_Util: local: ./src/Shared/@GMAO_Shared/@GEOS_Util remote: ../GEOS_Util.git - tag: GCMv12-rc8 + tag: GCMv12-rc11 develop: feature/sdrabenh/gcm_v12 # When updating the MAPL version, also update the MAPL version in the @@ -44,32 +44,32 @@ GEOS_Util: MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - tag: GCMv12-rc8 + tag: GCMv12-rc11 develop: feature/sdrabenh/gcm_v12 GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - tag: GCMv12-rc10 + tag: GCMv12-rc11 sparse: ./config/GEOSgcm_GridComp.sparse develop: feature/sdrabenh/gcm_v12 FVdycoreCubed_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp remote: ../FVdycoreCubed_GridComp.git - tag: GCMv12-rc10 + tag: GCMv12-rc11 develop: feature/sdrabenh/gcm_v12 fvdycore: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp/@fvdycore remote: ../GFDL_atmos_cubed_sphere.git - tag: GCMv12-rc9 + tag: GCMv12-rc11 develop: feature/sdrabenh/gcm_v12 GEOSchem_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp remote: ../GEOSchem_GridComp.git - tag: GCMv12-rc10 + tag: GCMv12-rc11 develop: feature/sdrabenh/gcm_v12 HEMCO: @@ -87,7 +87,7 @@ geos-chem: GOCART: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@GOCART remote: ../GOCART.git - tag: GCMv12-rc8 + tag: GCMv12-rc11 develop: feature/sdrabenh/gcm_v12 QuickChem: @@ -160,7 +160,7 @@ sis2: GEOSradiation_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSradiation_GridComp remote: ../GEOSradiation_GridComp.git - tag: GCMv12-rc10b + tag: GCMv12-rc11 develop: feature/sdrabenh/gcm_v12 RRTMGP: @@ -185,7 +185,7 @@ umwm: GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git - tag: GCMv12-rc10 + tag: GCMv12-rc11 develop: feature/sdrabenh/gcm_v12 UMD_Etc: From 3df7f2309f5d5c537efc06b0efc47cf25d5da270 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 13 Feb 2025 09:14:01 -0500 Subject: [PATCH 077/241] Update to Baselibs 8.13.0 --- .circleci/config.yml | 2 +- .github/workflows/workflow.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7bc743c5..89f77e31 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,7 +16,7 @@ parameters: # Anchors to prevent forgetting to update a version os_version: &os_version ubuntu24 -baselibs_version: &baselibs_version v8.12.0 +baselibs_version: &baselibs_version v8.13.0 bcs_version: &bcs_version v12.0.0 tag_build_arg_name: &tag_build_arg_name gcmversion diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 245ba747..60010354 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -19,7 +19,7 @@ jobs: if: "!contains(github.event.pull_request.labels.*.name, '0 diff trivial')" runs-on: ubuntu-latest container: - image: gmao/ubuntu24-geos-env:v8.12.0-intelmpi_2021.13-ifort_2021.13-bcs_v12.0.0 + image: gmao/ubuntu24-geos-env:v8.13.0-intelmpi_2021.13-ifort_2021.13-bcs_v12.0.0 # Per https://github.com/actions/virtual-environments/issues/1445#issuecomment-713861495 # It seems like we might not need secrets on GitHub Actions which is good for forked # pull requests From 069d5d248634178482406880161102af18633ed8 Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst Date: Fri, 14 Feb 2025 17:46:00 -0500 Subject: [PATCH 078/241] Uptick to tag GCMv12-rc11 again --- components.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/components.yaml b/components.yaml index 321f6a33..603ce0cd 100644 --- a/components.yaml +++ b/components.yaml @@ -44,20 +44,20 @@ GEOS_Util: MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - tag: GCMv12-rc11 + tag: GCMv12-rc12 develop: feature/sdrabenh/gcm_v12 GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - tag: GCMv12-rc11 + tag: GCMv12-rc12 sparse: ./config/GEOSgcm_GridComp.sparse develop: feature/sdrabenh/gcm_v12 FVdycoreCubed_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp remote: ../FVdycoreCubed_GridComp.git - tag: GCMv12-rc11 + tag: GCMv12-rc12 develop: feature/sdrabenh/gcm_v12 fvdycore: @@ -160,7 +160,7 @@ sis2: GEOSradiation_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSradiation_GridComp remote: ../GEOSradiation_GridComp.git - tag: GCMv12-rc11 + tag: GCMv12-rc12 develop: feature/sdrabenh/gcm_v12 RRTMGP: @@ -185,7 +185,7 @@ umwm: GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git - tag: GCMv12-rc11 + tag: GCMv12-rc12 develop: feature/sdrabenh/gcm_v12 UMD_Etc: From 727bbc0bef226ed6c3b76d45e2ace68920c20bfc Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 21 Feb 2025 14:55:50 -0500 Subject: [PATCH 079/241] Update to GEOS_OceanGridComp v3.4.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0bebdd12..373f9572 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.7.1](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.7.1) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.11.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.11.1) | | [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) | -| [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v3.3.0](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v3.3.0) | +| [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v3.4.0](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v3.4.0) | | [GEOS_Util](https://github.com/GEOS-ESM/GEOS_Util) | [v2.1.2](https://github.com/GEOS-ESM/GEOS_Util/releases/tag/v2.1.2) | | [GEOSchem_GridComp](https://github.com/GEOS-ESM/GEOSchem_GridComp) | [v1.14.0](https://github.com/GEOS-ESM/GEOSchem_GridComp/releases/tag/v1.14.0) | | [GEOSgcm_App](https://github.com/GEOS-ESM/GEOSgcm_App) | [v2.3.4](https://github.com/GEOS-ESM/GEOSgcm_App/releases/tag/v2.3.4) | diff --git a/components.yaml b/components.yaml index 652b836d..ce9b7949 100644 --- a/components.yaml +++ b/components.yaml @@ -117,7 +117,7 @@ StratChem: GEOS_OceanGridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp remote: ../GEOS_OceanGridComp.git - tag: v3.3.0 + tag: v3.4.0 develop: develop mom: From bebb3d19686b242e9952301bcf3db8fa93477f38 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 25 Feb 2025 13:15:16 -0500 Subject: [PATCH 080/241] Update to GEOS_OceanGridComp v3.4.1 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a97b2fab..e708fc72 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.7.1](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.7.1) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.11.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.11.1) | | [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) | -| [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v3.4.0](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v3.4.0) | +| [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v3.4.1](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v3.4.1) | | [GEOS_Util](https://github.com/GEOS-ESM/GEOS_Util) | [v2.1.2](https://github.com/GEOS-ESM/GEOS_Util/releases/tag/v2.1.2) | | [GEOSchem_GridComp](https://github.com/GEOS-ESM/GEOSchem_GridComp) | [v1.14.0](https://github.com/GEOS-ESM/GEOSchem_GridComp/releases/tag/v1.14.0) | | [GEOSgcm_App](https://github.com/GEOS-ESM/GEOSgcm_App) | [v2.3.4](https://github.com/GEOS-ESM/GEOSgcm_App/releases/tag/v2.3.4) | diff --git a/components.yaml b/components.yaml index ce9b7949..3bc9af26 100644 --- a/components.yaml +++ b/components.yaml @@ -117,7 +117,7 @@ StratChem: GEOS_OceanGridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp remote: ../GEOS_OceanGridComp.git - tag: v3.4.0 + tag: v3.4.1 develop: develop mom: From a32d515810583772922ff0d61bb268c2453ffe65 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 7 Mar 2025 14:44:10 -0500 Subject: [PATCH 081/241] v12: Update to Ocean GC v3.5.0, mom6 geos/v3.5 --- README.md | 4 ++-- components.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index e708fc72..02799035 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.7.1](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.7.1) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.11.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.11.1) | | [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) | -| [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v3.4.1](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v3.4.1) | +| [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v3.5.0](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v3.5.0) | | [GEOS_Util](https://github.com/GEOS-ESM/GEOS_Util) | [v2.1.2](https://github.com/GEOS-ESM/GEOS_Util/releases/tag/v2.1.2) | | [GEOSchem_GridComp](https://github.com/GEOS-ESM/GEOSchem_GridComp) | [v1.14.0](https://github.com/GEOS-ESM/GEOSchem_GridComp/releases/tag/v1.14.0) | | [GEOSgcm_App](https://github.com/GEOS-ESM/GEOSgcm_App) | [v2.3.4](https://github.com/GEOS-ESM/GEOSgcm_App/releases/tag/v2.3.4) | @@ -34,7 +34,7 @@ | [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.50.1](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.50.1) | | [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+2.1.0](https://github.com/GEOS-ESM/MOM5/releases/tag/geos%2F5.1.0%2B2.1.0) | -| [MOM6](https://github.com/GEOS-ESM/MOM6) | [geos/v3.4](https://github.com/GEOS-ESM/MOM6/tree/geos/v3.4) | +| [MOM6](https://github.com/GEOS-ESM/MOM6) | [geos/v3.5](https://github.com/GEOS-ESM/MOM6/tree/geos/v3.5) | | [NCEP_Shared](https://github.com/GEOS-ESM/NCEP_Shared) | [v1.3.0](https://github.com/GEOS-ESM/NCEP_Shared/releases/tag/v1.3.0) | | [QuickChem](https://github.com/GEOS-ESM/QuickChem) | [v1.0.0](https://github.com/GEOS-ESM/QuickChem/releases/tag/v1.0.0) | | [RRTMGP](https://github.com/GEOS-ESM/rte-rrtmgp) | [geos/v1.8+1.0.0](https://github.com/GEOS-ESM/rte-rrtmgp/releases/tag/geos%2Fv1.8%2B1.0.0) | diff --git a/components.yaml b/components.yaml index 3bc9af26..d2cd968b 100644 --- a/components.yaml +++ b/components.yaml @@ -117,7 +117,7 @@ StratChem: GEOS_OceanGridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp remote: ../GEOS_OceanGridComp.git - tag: v3.4.1 + tag: v3.5.0 develop: develop mom: @@ -129,7 +129,7 @@ mom: mom6: local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp/MOM6_GEOSPlug/@mom6 remote: ../MOM6.git - tag: geos/v3.4 + tag: geos/v3.5 develop: main recurse_submodules: true From 4fb82268d92300ece03a274f3514192737da7db1 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 7 Mar 2025 14:45:21 -0500 Subject: [PATCH 082/241] Use geos/main --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index d2cd968b..558ad4f1 100644 --- a/components.yaml +++ b/components.yaml @@ -130,7 +130,7 @@ mom6: local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp/MOM6_GEOSPlug/@mom6 remote: ../MOM6.git tag: geos/v3.5 - develop: main + develop: geos/main recurse_submodules: true mit: From 77061143e5a780735426d1c4f8950d4df5502691 Mon Sep 17 00:00:00 2001 From: Purnendu Chakraborty Date: Mon, 17 Mar 2025 15:39:28 -0400 Subject: [PATCH 083/241] Added mepo component geos_state_bias --- README.md | 5 +++-- components.yaml | 6 ++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 652107ec..3a6b4c8f 100644 --- a/README.md +++ b/README.md @@ -16,11 +16,12 @@ | [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/v1.3.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv1.3.0) | | [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.12.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.12.0) | -| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.7.1](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.7.1) | -| [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.11.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.11.1) | +| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.7.1](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.7.1) | +| [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.11.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.11.1) | | [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) | | [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v3.3.0](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v3.3.0) | | [GEOS_Util](https://github.com/GEOS-ESM/GEOS_Util) | [v2.1.2](https://github.com/GEOS-ESM/GEOS_Util/releases/tag/v2.1.2) | +| [geos_state_bias](https://github.com/GEOS-ESM/geos_state_bias) | [geos/v1.0.0](https://github.com/GEOS-ESM/geos_state_bias/releases/tag/v1.0.0) | | [GEOSchem_GridComp](https://github.com/GEOS-ESM/GEOSchem_GridComp) | [v1.14.0](https://github.com/GEOS-ESM/GEOSchem_GridComp/releases/tag/v1.14.0) | | [GEOSgcm_App](https://github.com/GEOS-ESM/GEOSgcm_App) | [v2.3.4](https://github.com/GEOS-ESM/GEOSgcm_App/releases/tag/v2.3.4) | | [GEOSgcm_GridComp](https://github.com/GEOS-ESM/GEOSgcm_GridComp) | [v2.6.1](https://github.com/GEOS-ESM/GEOSgcm_GridComp/releases/tag/v2.6.1) | diff --git a/components.yaml b/components.yaml index 603ce0cd..d9a4df47 100644 --- a/components.yaml +++ b/components.yaml @@ -54,6 +54,12 @@ GEOSgcm_GridComp: sparse: ./config/GEOSgcm_GridComp.sparse develop: feature/sdrabenh/gcm_v12 +geos_state_bias: + local: ./src/Components/@GEOSgcm_GridComp/GEOSmkiau_GridComp/pyMLINC/@geos_state_bias + remote: ../geos_state_bias.git + tag: geos/v1.0.0 + develop : geos/develop + FVdycoreCubed_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp remote: ../FVdycoreCubed_GridComp.git From e254b4a7a33a75884714aceb679e5eae61ada951 Mon Sep 17 00:00:00 2001 From: Purnendu Chakraborty Date: Mon, 17 Mar 2025 18:03:50 -0400 Subject: [PATCH 084/241] Fixed geos_state_bias's url --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3a6b4c8f..1bf9490d 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ | [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) | | [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v3.3.0](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v3.3.0) | | [GEOS_Util](https://github.com/GEOS-ESM/GEOS_Util) | [v2.1.2](https://github.com/GEOS-ESM/GEOS_Util/releases/tag/v2.1.2) | -| [geos_state_bias](https://github.com/GEOS-ESM/geos_state_bias) | [geos/v1.0.0](https://github.com/GEOS-ESM/geos_state_bias/releases/tag/v1.0.0) | +| [geos_state_bias](https://github.com/GEOS-ESM/geos_state_bias) | [geos/v1.0.0](https://github.com/GEOS-ESM/geos_state_bias/releases/tag/geos/v1.0.0) | | [GEOSchem_GridComp](https://github.com/GEOS-ESM/GEOSchem_GridComp) | [v1.14.0](https://github.com/GEOS-ESM/GEOSchem_GridComp/releases/tag/v1.14.0) | | [GEOSgcm_App](https://github.com/GEOS-ESM/GEOSgcm_App) | [v2.3.4](https://github.com/GEOS-ESM/GEOSgcm_App/releases/tag/v2.3.4) | | [GEOSgcm_GridComp](https://github.com/GEOS-ESM/GEOSgcm_GridComp) | [v2.6.1](https://github.com/GEOS-ESM/GEOSgcm_GridComp/releases/tag/v2.6.1) | From 7b48e9cbbf36652087b9aaaa73e3d05b33ad4b96 Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst Date: Tue, 25 Mar 2025 10:27:45 -0400 Subject: [PATCH 085/241] update rc12 tags --- components.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/components.yaml b/components.yaml index 558ad4f1..1419abae 100644 --- a/components.yaml +++ b/components.yaml @@ -44,20 +44,20 @@ GEOS_Util: MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - tag: GCMv12-rc11 + tag: GCMv12-rc12 develop: feature/sdrabenh/gcm_v12 GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - tag: GCMv12-rc11 + tag: GCMv12-rc12 sparse: ./config/GEOSgcm_GridComp.sparse develop: feature/sdrabenh/gcm_v12 FVdycoreCubed_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp remote: ../FVdycoreCubed_GridComp.git - tag: GCMv12-rc11 + tag: GCMv12-rc12 develop: feature/sdrabenh/gcm_v12 fvdycore: @@ -160,7 +160,7 @@ sis2: GEOSradiation_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSradiation_GridComp remote: ../GEOSradiation_GridComp.git - tag: GCMv12-rc11 + tag: GCMv12-rc12 develop: feature/sdrabenh/gcm_v12 RRTMGP: @@ -185,7 +185,7 @@ umwm: GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git - tag: GCMv12-rc11 + tag: GCMv12-rc12 develop: feature/sdrabenh/gcm_v12 UMD_Etc: From 5bd4ce47b0dc9310da3d79643267dc10ccfb7cb1 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 25 Mar 2025 11:57:04 -0400 Subject: [PATCH 086/241] v12: Remove NCCS OS detection --- README.md | 4 ++-- components.yaml | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 02799035..429ca61d 100644 --- a/README.md +++ b/README.md @@ -15,8 +15,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/v1.3.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv1.3.0) | -| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.12.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.12.0) | -| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.7.1](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.7.1) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.14.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.14.0) | +| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.10.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.10.0) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.11.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.11.1) | | [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) | | [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v3.5.0](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v3.5.0) | diff --git a/components.yaml b/components.yaml index 558ad4f1..8827a513 100644 --- a/components.yaml +++ b/components.yaml @@ -5,13 +5,13 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v5.7.1 + tag: v5.10.0 develop: main cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v4.12.0 + tag: v4.14.0 develop: develop ecbuild: @@ -36,7 +36,7 @@ GMAO_Shared: GEOS_Util: local: ./src/Shared/@GMAO_Shared/@GEOS_Util remote: ../GEOS_Util.git - tag: GCMv12-rc11 + branch: feature/mathomp4/v12-remove-sles15-detection develop: feature/sdrabenh/gcm_v12 # When updating the MAPL version, also update the MAPL version in the @@ -50,14 +50,14 @@ MAPL: GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - tag: GCMv12-rc11 + branch: feature/mathomp4/v12-remove-sles15-detection sparse: ./config/GEOSgcm_GridComp.sparse develop: feature/sdrabenh/gcm_v12 FVdycoreCubed_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp remote: ../FVdycoreCubed_GridComp.git - tag: GCMv12-rc11 + branch: feature/mathomp4/v12-remove-sles15-detection develop: feature/sdrabenh/gcm_v12 fvdycore: @@ -185,7 +185,7 @@ umwm: GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git - tag: GCMv12-rc11 + branch: feature/mathomp4/v12-remove-sles15-detection develop: feature/sdrabenh/gcm_v12 UMD_Etc: From 25de152bfd3685e31a3ef0554803780751dae79a Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst Date: Tue, 25 Mar 2025 13:52:39 -0400 Subject: [PATCH 087/241] Uptick cmake and env repos --- README.md | 4 ++-- components.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index fc4d309d..560f7fb1 100644 --- a/README.md +++ b/README.md @@ -15,8 +15,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/v1.3.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv1.3.0) | -| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.12.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.12.0) | -| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.7.1](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.7.1) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.14.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.14.0) | +| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.10.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.10.0) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.11.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.11.1) | | [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) | | [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v3.5.0](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v3.5.0) | diff --git a/components.yaml b/components.yaml index 9128e2c3..a4b2eddf 100644 --- a/components.yaml +++ b/components.yaml @@ -5,13 +5,13 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v5.7.1 + tag: v5.10.0 develop: main cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v4.12.0 + tag: v4.14.0 develop: develop ecbuild: From 066da2a11ae5f1cd64309fd5b6621e568dfa79ef Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 28 Mar 2025 12:37:09 -0400 Subject: [PATCH 088/241] Update README --- README.md | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 429ca61d..74ed74e5 100644 --- a/README.md +++ b/README.md @@ -55,26 +55,18 @@ In your `.bashrc` or `.tcshrc` or other rc file add a line: ##### NCCS -NCCS currently has two different OSs. So you'll need to use different modulefiles depending on which OS you are using. - -###### SLES 12 - -``` -module use -a /discover/swdev/gmao_SIteam/modulefiles-SLES12 -``` - -###### SLES 15 - ``` module use -a /discover/swdev/gmao_SIteam/modulefiles-SLES15 ``` ##### NAS + ``` module use -a /nobackup/gmao_SIteam/modulefiles ``` ##### GMAO Desktops + On the GMAO desktops, the SI Team modulefiles should automatically be part of running `module avail` but if not, they are in: @@ -158,16 +150,12 @@ you choose. ### Single Step Building of the Model -If all you wish is to build the model, you can run `parallel_build.csh` from a head node. Doing so will checkout all the external repositories of the model and build it. When done, the resulting model build will be found in `build/` and the installation will be found in `install/` with setup scripts like `gcm_setup` and `fvsetup` in `install/bin`. - -#### Building at NCCS (Multiple OSs) - -In all the examples below, NCCS builds will act differently. Because NCCS currently has two different OSs, when you use -`parallel_build.csh` you will see that the `build` and `install` directories will be appended with `-SLES12` or `-SLES15` depending -on where you submitted to. When NCCS moves to a single OS again, this will be removed. +If all you wish is to build the model, you can run: +``` +./parallel_build.csh +``` -Note that if you use the `-builddir` and `-installdir` options, you can override this behavior and no OS will be automatically -appended. +from a login node. Doing so will checkout all the external repositories of the model and build it. When done, the resulting model build will be found in `build/` and the installation will be found in `install/` with setup scripts like `gcm_setup` and `fvsetup` in `install/bin`. #### Develop Version of GEOS GCM @@ -245,6 +233,7 @@ each sub-repository. #### Build the Model ##### Load Compiler, MPI Stack, and Baselibs + On tcsh: ``` source @env/g5_modules @@ -296,10 +285,13 @@ Note that running with `parallel_build.csh` will create and install a tarfile of ``` to your CMake command. -##### Build and Install with Make +##### Build and Install + ``` cmake --build build -j N +cmake --install build ``` + where `N` is the number of parallel processes. On discover head nodes, this should only be as high as 2 due to limits on the head nodes. On a compute node, you can set `N` has high as you like, though 8-12 is about the limit of parallelism in our model's make system. ### Run the GCM From 0851881b5a0a395defa77d4ab70b1c96fce65052 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 28 Mar 2025 12:39:35 -0400 Subject: [PATCH 089/241] Update README like v11 --- README.md | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 74ed74e5..781b3227 100644 --- a/README.md +++ b/README.md @@ -2,11 +2,10 @@ ## CI Status -| CI Provider | Status | -| ----------- | ------ | +| CI Provider | Status | +| ----------- | ------ | | CircleCI | [![CircleCI](https://circleci.com/gh/GEOS-ESM/GEOSgcm.svg?style=svg)](https://circleci.com/gh/GEOS-ESM/GEOSgcm) | -| AWS CodeBuild | ![CodeBuild](https://codebuild.us-east-1.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiZitEZE1kODFtUUhuZU5tN1pDbHZvbDlEQUEwNWR0a2JCM1F1MmlTaWZYV1JxNWIxMjZDSThOUi9mUDJKSVBuaEVRa1FxV2FncitOcExyemNaWFFIbjVrPSIsIml2UGFyYW1ldGVyU3BlYyI6IlBudmE3N1A0MTNNR3ZhNVoiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=main) | -| GitHub | ![GitHub](https://github.com/GEOS-ESM/GEOSgcm/workflows/Build%20Tests/badge.svg) | +| GitHub | ![GitHub](https://github.com/GEOS-ESM/GEOSgcm/workflows/Build%20Tests/badge.svg) | ## Current State of GEOSgcm Subrepos @@ -146,6 +145,20 @@ Note that when you first use `gh`, it will ask what your preferred git protocol is (https or ssh) to use "underneath". The caveats above will apply to whichever you choose. +### Setting up `mepo` to use blobless clones + +The GEOS GCM uses a Python utility called [mepo](https://github.com/GEOS-ESM/mepo/) to manage **m**ultiple git r**epo**sitories instead of using other technologies like Git +submodules. `mepo` uses a YAML file that provides a list of components (and their versions) that are required for a particular configuration of GEOS GCM. + +We *highly* recommend setting up `mepo` to use [blobless clones](https://github.blog/open-source/git/get-up-to-speed-with-partial-clone-and-shallow-clone/) to speed +up cloning of the sub-repositories, especially on discover. To do this, there is a one-time command to run: + +``` +mepo config set clone.partial blobless +``` + +This will set up `mepo` to use blobless clones for all future clones by adding an entry to `~/.mepoconfig`. + --- ### Single Step Building of the Model From a13c49ebd3dbcdda376fcfec1da2032b2340c10a Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 3 Apr 2025 11:14:10 -0400 Subject: [PATCH 090/241] Update to ESMA_cmake v4.14.1 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 781b3227..9415ed6f 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ | [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/v1.3.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv1.3.0) | -| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.14.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.14.0) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.14.1](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.14.1) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.10.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.10.0) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.11.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.11.1) | | [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) | diff --git a/components.yaml b/components.yaml index 8827a513..5cec931f 100644 --- a/components.yaml +++ b/components.yaml @@ -11,7 +11,7 @@ env: cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v4.14.0 + tag: v4.14.1 develop: develop ecbuild: From fb1fa2721760c1971690383569e516c30646905a Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 7 Apr 2025 09:25:11 -0400 Subject: [PATCH 091/241] Merge develop into v12 for chem split --- .github/workflows/push-to-main.yml | 2 +- components.yaml | 44 +++++++++++++++++++++++++++--- 2 files changed, 41 insertions(+), 5 deletions(-) diff --git a/.github/workflows/push-to-main.yml b/.github/workflows/push-to-main.yml index 959a3b36..32e0fb50 100644 --- a/.github/workflows/push-to-main.yml +++ b/.github/workflows/push-to-main.yml @@ -15,7 +15,7 @@ jobs: with: fetch-depth: 0 - name: Run the action - uses: devops-infra/action-pull-request@v0.5.5 + uses: devops-infra/action-pull-request@v0.6.0 with: github_token: ${{ secrets.GITHUB_TOKEN }} source_branch: main diff --git a/components.yaml b/components.yaml index a4b2eddf..05e28607 100644 --- a/components.yaml +++ b/components.yaml @@ -50,7 +50,7 @@ MAPL: GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - tag: GCMv12-rc12 + branch: feature/split-chem-v12 sparse: ./config/GEOSgcm_GridComp.sparse develop: feature/sdrabenh/gcm_v12 @@ -75,7 +75,7 @@ fvdycore: GEOSchem_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp remote: ../GEOSchem_GridComp.git - tag: GCMv12-rc11 + branch: feature/split-chem-v12 develop: feature/sdrabenh/gcm_v12 HEMCO: @@ -102,6 +102,12 @@ QuickChem: tag: v1.0.0 develop: main +RRG: + local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@RRG + remote: ../RRG.git + tag: v1.1.0 + develop: main + TR: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@TR remote: ../TR.git @@ -120,6 +126,36 @@ StratChem: tag: v1.0.0 develop: develop +MAM: + local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@MAM + remote: ../MAM.git + tag: v1.0.0 + develop: main + +MATRIX: + local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@MATRIX + remote: ../MATRIX.git + tag: v1.0.0 + develop: main + +CARMA: + local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@CARMA + remote: ../CARMA.git + tag: v1.1.0 + develop: develop + +GAAS: + local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@GAAS + remote: ../GAAS.git + tag: v1.0.0 + develop: develop + +ACHEM: + local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@ACHEM + remote: ../ACHEM.git + tag: v1.0.0 + develop: develop + GEOS_OceanGridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp remote: ../GEOS_OceanGridComp.git @@ -166,7 +202,7 @@ sis2: GEOSradiation_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSradiation_GridComp remote: ../GEOSradiation_GridComp.git - tag: GCMv12-rc12 + branch: feature/split-chem-v12 develop: feature/sdrabenh/gcm_v12 RRTMGP: @@ -191,7 +227,7 @@ umwm: GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git - tag: GCMv12-rc12 + branch: feature/split-chem-v12 develop: feature/sdrabenh/gcm_v12 UMD_Etc: From 109104077fc07ceddbb2eef125d6235d1903ba61 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 7 Apr 2025 09:36:17 -0400 Subject: [PATCH 092/241] Fix up github actions --- .github/workflows/workflow.yml | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 60010354..583bdbb2 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -13,59 +13,67 @@ on: - ".codebuild/**" - ".circleci/**" +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: ${{ github.ref != 'refs/heads/main' }} + jobs: build_gcm: name: Build GEOSgcm if: "!contains(github.event.pull_request.labels.*.name, '0 diff trivial')" - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 container: - image: gmao/ubuntu24-geos-env:v8.13.0-intelmpi_2021.13-ifort_2021.13-bcs_v12.0.0 + image: gmao/ubuntu24-geos-env:v8.13.0-intelmpi_2021.13-ifort_2021.13 # Per https://github.com/actions/virtual-environments/issues/1445#issuecomment-713861495 # It seems like we might not need secrets on GitHub Actions which is good for forked # pull requests #credentials: #username: ${{ secrets.DOCKERHUB_USERNAME }} #password: ${{ secrets.DOCKERHUB_TOKEN }} + env: OMPI_ALLOW_RUN_AS_ROOT: 1 OMPI_ALLOW_RUN_AS_ROOT_CONFIRM: 1 OMPI_MCA_btl_vader_single_copy_mechanism: none + steps: # https://github.com/orgs/community/discussions/25678#discussioncomment-5242449 - name: Delete huge unnecessary tools folder run: rm -rf /opt/hostedtoolcache - - name: Cancel Previous Runs - uses: styfle/cancel-workflow-action@0.12.1 - with: - access_token: ${{ github.token }} + - name: Checkout GCM uses: actions/checkout@v4 with: fetch-depth: 1 + filter: blob:none + - name: Set all directories as git safe run: | git config --global --add safe.directory '*' + - name: Versions etc. run: | ifort --version mpirun --version echo $BASEDIR + - name: Mepo clone external repos run: | - mepo clone + mepo clone --partial blobless mepo status + - name: Update other branches if: "!contains('refs/heads/main,refs/heads/develop', github.ref)" run: | mepo checkout-if-exists ${GITHUB_HEAD_REF} mepo status + - name: CMake run: | - mkdir build - cd build - cmake .. -DBASEDIR=$BASEDIR/Linux -DCMAKE_Fortran_COMPILER=ifort -DCMAKE_BUILD_TYPE=Debug -DMPIEXEC_PREFLAGS='--oversubscribe' -DUSE_F2PY=OFF + cmake -B build -S . --install-prefix=${pwd}/install -DCMAKE_Fortran_COMPILER=ifort -DCMAKE_BUILD_TYPE=Debug -DMPIEXEC_PREFLAGS='--oversubscribe' -DUSE_F2PY=OFF + - name: Build run: | - cd build - make -j4 install + cmake --build build -j 4 + cmake --install build From e013ec7a2d77abb5a52d0d0685f295090724133a Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 7 Apr 2025 13:03:04 -0400 Subject: [PATCH 093/241] Turn off ifx to save money --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 89f77e31..a96e9b90 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -32,7 +32,7 @@ workflows: - docker-hub-creds matrix: parameters: - compiler: [gfortran, ifort, ifx] + compiler: [gfortran, ifort] baselibs_version: *baselibs_version repo: GEOSgcm persist_workspace: true # Needs to be true to run fv3/gcm experiment, costs extra @@ -44,7 +44,7 @@ workflows: - docker-hub-creds matrix: parameters: - compiler: [gfortran, ifort, ifx] + compiler: [gfortran, ifort] requires: - build-GEOSgcm-on-<< matrix.compiler >> repo: GEOSgcm From d13ec97179f1a08482e96640e55b16ed16343428 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 7 Apr 2025 16:54:01 -0400 Subject: [PATCH 094/241] Achem needs changes --- components.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components.yaml b/components.yaml index 05e28607..b9310194 100644 --- a/components.yaml +++ b/components.yaml @@ -153,8 +153,8 @@ GAAS: ACHEM: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@ACHEM remote: ../ACHEM.git - tag: v1.0.0 - develop: develop + branch: feature/split-chem-v12 + develop: feature/sdrabenh/gcm_v12 GEOS_OceanGridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp From 5087121d6447fc15bbefcbd730e50fded9fe8305 Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst <53346946+sdrabenh@users.noreply.github.com> Date: Mon, 14 Apr 2025 11:23:34 -0400 Subject: [PATCH 095/241] Update components.yaml to v12 branches --- components.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/components.yaml b/components.yaml index b9310194..f6dc92df 100644 --- a/components.yaml +++ b/components.yaml @@ -50,7 +50,7 @@ MAPL: GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - branch: feature/split-chem-v12 + branch: feature/sdrabenh/gcm_v12 sparse: ./config/GEOSgcm_GridComp.sparse develop: feature/sdrabenh/gcm_v12 @@ -75,7 +75,7 @@ fvdycore: GEOSchem_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp remote: ../GEOSchem_GridComp.git - branch: feature/split-chem-v12 + branch: feature/sdrabenh/gcm_v12 develop: feature/sdrabenh/gcm_v12 HEMCO: @@ -153,7 +153,7 @@ GAAS: ACHEM: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@ACHEM remote: ../ACHEM.git - branch: feature/split-chem-v12 + branch: feature/sdrabenh/gcm_v12 develop: feature/sdrabenh/gcm_v12 GEOS_OceanGridComp: @@ -202,7 +202,7 @@ sis2: GEOSradiation_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSradiation_GridComp remote: ../GEOSradiation_GridComp.git - branch: feature/split-chem-v12 + branch: feature/sdrabenh/gcm_v12 develop: feature/sdrabenh/gcm_v12 RRTMGP: @@ -227,7 +227,7 @@ umwm: GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git - branch: feature/split-chem-v12 + branch: feature/sdrabenh/gcm_v12 develop: feature/sdrabenh/gcm_v12 UMD_Etc: From 09a13568710cf5d71e9844b23e11cc62304aff6e Mon Sep 17 00:00:00 2001 From: Matt Thompson Date: Mon, 14 Apr 2025 13:35:52 -0400 Subject: [PATCH 096/241] Update components.yaml --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index 85bd5af1..f34c6013 100644 --- a/components.yaml +++ b/components.yaml @@ -36,7 +36,7 @@ GMAO_Shared: GEOS_Util: local: ./src/Shared/@GMAO_Shared/@GEOS_Util remote: ../GEOS_Util.git - branch: feature/mathomp4/v12-remove-sles15-detection + branch: feature/sdrabenh/gcm_v12 develop: feature/sdrabenh/gcm_v12 # When updating the MAPL version, also update the MAPL version in the From 6d1af8a0dd8ded3e9e89c4dc8a6946168c814aee Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 14 Apr 2025 14:34:02 -0400 Subject: [PATCH 097/241] Update fvdycore and GOCART to tracking branch --- components.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components.yaml b/components.yaml index f34c6013..3bf37332 100644 --- a/components.yaml +++ b/components.yaml @@ -69,7 +69,7 @@ FVdycoreCubed_GridComp: fvdycore: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp/@fvdycore remote: ../GFDL_atmos_cubed_sphere.git - tag: GCMv12-rc11 + branch: feature/sdrabenh/gcm_v12 develop: feature/sdrabenh/gcm_v12 GEOSchem_GridComp: @@ -93,7 +93,7 @@ geos-chem: GOCART: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@GOCART remote: ../GOCART.git - tag: GCMv12-rc11 + branch: feature/sdrabenh/gcm_v12 develop: feature/sdrabenh/gcm_v12 QuickChem: From e1f68c48357aeb57d1515b6058308b5b3bc10084 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 14 Apr 2025 15:54:16 -0400 Subject: [PATCH 098/241] use blobless clone --- parallel_build.csh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parallel_build.csh b/parallel_build.csh index c8219d3b..b28d2a40 100755 --- a/parallel_build.csh +++ b/parallel_build.csh @@ -44,7 +44,7 @@ else exit 1 else echo "Running mepo clone" - mepo clone + mepo clone --partial blobless if ( "$DEVELOP" == "TRUE" ) then echo "Checking out development branches of GEOSgcm_GridComp, GEOSgcm_App, GMAO_Shared, and GEOS_Util" mepo develop GEOSgcm_GridComp GEOSgcm_App GMAO_Shared GEOS_Util From 4f4044c70b48783a611c7baea43490b2d1e6f29b Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 24 Apr 2025 11:26:28 -0400 Subject: [PATCH 099/241] Update to ESMA_cmake v4.15.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 145ebb02..31a278d6 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ | [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/v1.3.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv1.3.0) | -| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.14.1](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.14.1) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.15.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.15.0) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.10.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.10.0) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.11.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.11.1) | | [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) | diff --git a/components.yaml b/components.yaml index 3bf37332..3ffde35c 100644 --- a/components.yaml +++ b/components.yaml @@ -11,7 +11,7 @@ env: cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v4.14.1 + tag: v4.15.0 develop: develop ecbuild: From 3d89011d421dbeb65cfd03123141b77c9e6e3c2f Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst Date: Fri, 25 Apr 2025 08:59:51 -0400 Subject: [PATCH 100/241] Uptick ww3 and NCEP_Shared --- components.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components.yaml b/components.yaml index 3ffde35c..68722aab 100644 --- a/components.yaml +++ b/components.yaml @@ -22,7 +22,7 @@ ecbuild: NCEP_Shared: local: ./src/Shared/@NCEP_Shared remote: ../NCEP_Shared.git - tag: v1.3.0 + tag: v1.4.0 sparse: ./config/NCEP_Shared.sparse develop: main @@ -215,7 +215,7 @@ RRTMGP: ww3: local: ./src/Components/@GEOSgcm_GridComp/GEOSwgcm_GridComp/GEOSwavewatch_GridComp/@ww3 remote: ../WW3.git - tag: v6.07.1-geos-r2 + tag: v7.14-geos-r1 develop: geos/develop umwm: From a186eb697dec66f8d5d7b20805cae33196a605f3 Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst Date: Fri, 25 Apr 2025 09:02:33 -0400 Subject: [PATCH 101/241] Uptick MAPL --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index 68722aab..cee33386 100644 --- a/components.yaml +++ b/components.yaml @@ -44,7 +44,7 @@ GEOS_Util: MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - tag: GCMv12-rc12 + tag: v2.55.0 develop: feature/sdrabenh/gcm_v12 GEOSgcm_GridComp: From d8359f4666b488780e5f87166704ef366334c82d Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 25 Apr 2025 09:32:15 -0400 Subject: [PATCH 102/241] Add in commented branches --- components.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/components.yaml b/components.yaml index 564dc3a6..f540766a 100644 --- a/components.yaml +++ b/components.yaml @@ -37,6 +37,7 @@ GMAO_Shared: GEOS_Util: local: ./src/Shared/@GMAO_Shared/@GEOS_Util remote: ../GEOS_Util.git + #branch: feature/sdrabenh/gcm_v12 branch: feature/sdrabenh/dev_into_v12_20250424 develop: feature/sdrabenh/gcm_v12 @@ -57,6 +58,7 @@ MAPL: GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git + #branch: feature/sdrabenh/gcm_v12 branch: feature/sdrabenh/dev_into_v12_20250424 sparse: ./config/GEOSgcm_GridComp.sparse develop: feature/sdrabenh/gcm_v12 @@ -240,6 +242,7 @@ umwm: GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git + #branch: feature/sdrabenh/gcm_v12 branch: feature/sdrabenh/dev_into_v12_20250424 develop: feature/sdrabenh/gcm_v12 From 1d1e83123e88d32009d8eb0375664c84b3f47ba0 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 25 Apr 2025 11:32:42 -0400 Subject: [PATCH 103/241] Add fms to spack CI --- .github/workflows/spack-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/spack-ci.yml b/.github/workflows/spack-ci.yml index 4328973d..a8c51fb9 100644 --- a/.github/workflows/spack-ci.yml +++ b/.github/workflows/spack-ci.yml @@ -92,7 +92,8 @@ jobs: shell: spack-bash {0} run: | spack -e spack-env install --add --no-check-signature --use-buildcache only \ - esmf gftl gftl-shared fargparse pflogger pfunit yafyaml ecbuild udunits openblas + esmf gftl gftl-shared fargparse pflogger pfunit yafyaml ecbuild udunits openblas \ + fms@2024.03 - name: Build with Cmake shell: spack-bash {0} From b820d2083bf9a2b8c61dbd42a253d002b60eaad7 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 25 Apr 2025 11:43:33 -0400 Subject: [PATCH 104/241] Be very specific about FMS --- .github/workflows/spack-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/spack-ci.yml b/.github/workflows/spack-ci.yml index a8c51fb9..96bbc277 100644 --- a/.github/workflows/spack-ci.yml +++ b/.github/workflows/spack-ci.yml @@ -93,14 +93,15 @@ jobs: run: | spack -e spack-env install --add --no-check-signature --use-buildcache only \ esmf gftl gftl-shared fargparse pflogger pfunit yafyaml ecbuild udunits openblas \ - fms@2024.03 + fms@2024.03 ~gfs_phys +pic +yaml constants=GEOS precision=32,64 +deprecated_io ~yaml - name: Build with Cmake shell: spack-bash {0} run: | spack env activate spack-env spack load \ - esmf gftl gftl-shared fargparse pflogger pfunit yafyaml ecbuild udunits openblas + esmf gftl gftl-shared fargparse pflogger pfunit yafyaml ecbuild udunits openblas \ + fms@2024.03 ~gfs_phys +pic +yaml constants=GEOS precision=32,64 +deprecated_io ~yaml spack find --loaded FC=gfortran-14 CC=gcc-14 CXX=g++-14 cmake -B build -S . -DCMAKE_INSTALL_PREFIX=$PWD/install -DCMAKE_BUILD_TYPE=Debug -DUSE_F2PY=OFF -DCMAKE_Fortran_COMPILER=${FC} -DCMAKE_C_COMPILER=${CC} -DCMAKE_CXX_COMPILER=${CXX} From 11412c7478a66fb09ed1e3453d4b198d30d3d4b7 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 25 Apr 2025 11:48:23 -0400 Subject: [PATCH 105/241] Fix typo --- .github/workflows/spack-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/spack-ci.yml b/.github/workflows/spack-ci.yml index 96bbc277..a57e7bef 100644 --- a/.github/workflows/spack-ci.yml +++ b/.github/workflows/spack-ci.yml @@ -93,7 +93,7 @@ jobs: run: | spack -e spack-env install --add --no-check-signature --use-buildcache only \ esmf gftl gftl-shared fargparse pflogger pfunit yafyaml ecbuild udunits openblas \ - fms@2024.03 ~gfs_phys +pic +yaml constants=GEOS precision=32,64 +deprecated_io ~yaml + fms@2024.03 ~gfs_phys +pic constants=GEOS precision=32,64 +deprecated_io ~yaml - name: Build with Cmake shell: spack-bash {0} @@ -101,7 +101,7 @@ jobs: spack env activate spack-env spack load \ esmf gftl gftl-shared fargparse pflogger pfunit yafyaml ecbuild udunits openblas \ - fms@2024.03 ~gfs_phys +pic +yaml constants=GEOS precision=32,64 +deprecated_io ~yaml + fms@2024.03 ~gfs_phys +pic constants=GEOS precision=32,64 +deprecated_io ~yaml spack find --loaded FC=gfortran-14 CC=gcc-14 CXX=g++-14 cmake -B build -S . -DCMAKE_INSTALL_PREFIX=$PWD/install -DCMAKE_BUILD_TYPE=Debug -DUSE_F2PY=OFF -DCMAKE_Fortran_COMPILER=${FC} -DCMAKE_C_COMPILER=${CC} -DCMAKE_CXX_COMPILER=${CXX} From 9cd87b8843df48ac85d821165fe8f5d54efa2918 Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst <53346946+sdrabenh@users.noreply.github.com> Date: Fri, 25 Apr 2025 14:33:17 -0400 Subject: [PATCH 106/241] Revert back to v12 branches --- components.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components.yaml b/components.yaml index f540766a..8d056130 100644 --- a/components.yaml +++ b/components.yaml @@ -30,7 +30,7 @@ GMAO_Shared: local: ./src/Shared/@GMAO_Shared remote: ../GMAO_Shared.git #tag: GCMv12-rc8 - branch: feature/sdrabenh/dev_into_v12_20250424 + branch: feature/sdrabenh/gcm_v12 sparse: ./config/GMAO_Shared.sparse develop: feature/sdrabenh/gcm_v12 @@ -38,7 +38,7 @@ GEOS_Util: local: ./src/Shared/@GMAO_Shared/@GEOS_Util remote: ../GEOS_Util.git #branch: feature/sdrabenh/gcm_v12 - branch: feature/sdrabenh/dev_into_v12_20250424 + branch: feature/sdrabenh/gcm_v12 develop: feature/sdrabenh/gcm_v12 GMAO_perllib: @@ -59,7 +59,7 @@ GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git #branch: feature/sdrabenh/gcm_v12 - branch: feature/sdrabenh/dev_into_v12_20250424 + branch: feature/sdrabenh/gcm_v12 sparse: ./config/GEOSgcm_GridComp.sparse develop: feature/sdrabenh/gcm_v12 @@ -243,7 +243,7 @@ GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git #branch: feature/sdrabenh/gcm_v12 - branch: feature/sdrabenh/dev_into_v12_20250424 + branch: feature/sdrabenh/gcm_v12 develop: feature/sdrabenh/gcm_v12 UMD_Etc: From 95cc5a2ab95478226c29b7a6f236626fad6c2c10 Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst Date: Mon, 28 Apr 2025 09:53:48 -0400 Subject: [PATCH 107/241] Uptick to prerelease GCMv12-rc13 --- components.yaml | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/components.yaml b/components.yaml index 8d056130..ced4c3d9 100644 --- a/components.yaml +++ b/components.yaml @@ -29,16 +29,14 @@ NCEP_Shared: GMAO_Shared: local: ./src/Shared/@GMAO_Shared remote: ../GMAO_Shared.git - #tag: GCMv12-rc8 - branch: feature/sdrabenh/gcm_v12 + tag: GCMv12-rc13 sparse: ./config/GMAO_Shared.sparse develop: feature/sdrabenh/gcm_v12 GEOS_Util: local: ./src/Shared/@GMAO_Shared/@GEOS_Util remote: ../GEOS_Util.git - #branch: feature/sdrabenh/gcm_v12 - branch: feature/sdrabenh/gcm_v12 + tag: GCMv12-rc13 develop: feature/sdrabenh/gcm_v12 GMAO_perllib: @@ -52,14 +50,13 @@ GMAO_perllib: MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - tag: v2.55.0 + tag: GCMv12-rc13 develop: feature/sdrabenh/gcm_v12 GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - #branch: feature/sdrabenh/gcm_v12 - branch: feature/sdrabenh/gcm_v12 + tag: GCMv12-rc13 sparse: ./config/GEOSgcm_GridComp.sparse develop: feature/sdrabenh/gcm_v12 @@ -78,19 +75,19 @@ GigaTraj: FVdycoreCubed_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp remote: ../FVdycoreCubed_GridComp.git - branch: feature/sdrabenh/gcm_v12 + tag: GCMv12-rc13 develop: feature/sdrabenh/gcm_v12 fvdycore: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp/@fvdycore remote: ../GFDL_atmos_cubed_sphere.git - branch: feature/sdrabenh/gcm_v12 + tag: GCMv12-rc13 develop: feature/sdrabenh/gcm_v12 GEOSchem_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp remote: ../GEOSchem_GridComp.git - branch: feature/sdrabenh/gcm_v12 + tag: GCMv12-rc13 develop: feature/sdrabenh/gcm_v12 HEMCO: @@ -108,7 +105,7 @@ geos-chem: GOCART: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@GOCART remote: ../GOCART.git - branch: feature/sdrabenh/gcm_v12 + tag: GCMv12-rc13 develop: feature/sdrabenh/gcm_v12 QuickChem: @@ -168,7 +165,7 @@ GAAS: ACHEM: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@ACHEM remote: ../ACHEM.git - branch: feature/sdrabenh/gcm_v12 + tag: GCMv12-rc13 develop: feature/sdrabenh/gcm_v12 GEOS_OceanGridComp: @@ -217,7 +214,7 @@ sis2: GEOSradiation_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSradiation_GridComp remote: ../GEOSradiation_GridComp.git - branch: feature/sdrabenh/gcm_v12 + tag: GCMv12-rc13 develop: feature/sdrabenh/gcm_v12 RRTMGP: @@ -242,8 +239,7 @@ umwm: GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git - #branch: feature/sdrabenh/gcm_v12 - branch: feature/sdrabenh/gcm_v12 + tag: GCMv12-rc13 develop: feature/sdrabenh/gcm_v12 UMD_Etc: From 69192f690f290e8176dc5b2cc51135b73f85c2aa Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 5 May 2025 12:46:04 -0400 Subject: [PATCH 108/241] v12: Update to ESMA_cmake v4.16.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 18b2d9af..c8b36ee2 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ | [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/v1.4.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv1.4.0) | -| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.15.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.15.0) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.16.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.16.0) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.10.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.10.0) | | [FMS](https://github.com/GEOS-ESM/FMS) | [geos/2019.01.02+noaff.10](https://github.com/GEOS-ESM/FMS/releases/tag/geos%2F2019.01.02%2Bnoaff.10) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.14.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.14.0) | diff --git a/components.yaml b/components.yaml index ced4c3d9..df90d660 100644 --- a/components.yaml +++ b/components.yaml @@ -11,7 +11,7 @@ env: cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v4.15.0 + tag: v4.16.0 develop: develop ecbuild: From fa5ae03080225da317a9a6fc0d528c04d09d055f Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 5 May 2025 12:46:39 -0400 Subject: [PATCH 109/241] Update to ESMA_env v5.11.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c8b36ee2..a15df9a9 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ | [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/v1.4.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv1.4.0) | | [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.16.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.16.0) | -| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.10.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.10.0) | +| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.11.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.11.0) | | [FMS](https://github.com/GEOS-ESM/FMS) | [geos/2019.01.02+noaff.10](https://github.com/GEOS-ESM/FMS/releases/tag/geos%2F2019.01.02%2Bnoaff.10) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.14.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.14.0) | | [GAAS](https://github.com/GEOS-ESM/GAAS) | [v1.0.0](https://github.com/GEOS-ESM/GAAS/releases/tag/v1.0.0) | diff --git a/components.yaml b/components.yaml index df90d660..0fba55c3 100644 --- a/components.yaml +++ b/components.yaml @@ -5,7 +5,7 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v5.10.0 + tag: v5.11.0 develop: main cmake: From 13dd2204a2f5616213aae5b5fd4992ff898b95b8 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 5 May 2025 12:53:42 -0400 Subject: [PATCH 110/241] Update to ecbuild geos/v2.0.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a15df9a9..d3a09762 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ | [CARMA](https://github.com/GEOS-ESM/CARMA) | [v1.1.0](https://github.com/GEOS-ESM/CARMA/releases/tag/v1.1.0) | | [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/v1.4.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv1.4.0) | +| [ecbuild](https://github.com/GEOS-ESM/ecbuild) | [geos/v2.0.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv2.0.0) | | [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.16.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.16.0) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.11.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.11.0) | | [FMS](https://github.com/GEOS-ESM/FMS) | [geos/2019.01.02+noaff.10](https://github.com/GEOS-ESM/FMS/releases/tag/geos%2F2019.01.02%2Bnoaff.10) | diff --git a/components.yaml b/components.yaml index 0fba55c3..238aeb3c 100644 --- a/components.yaml +++ b/components.yaml @@ -17,7 +17,7 @@ cmake: ecbuild: local: ./@cmake/@ecbuild remote: ../ecbuild.git - tag: geos/v1.4.0 + tag: geos/v2.0.0 NCEP_Shared: local: ./src/Shared/@NCEP_Shared From 4bc09be29876f3a9168fbb72a616d4254b14afa6 Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst Date: Mon, 5 May 2025 15:53:23 -0400 Subject: [PATCH 111/241] Uptick to GCMv12-rc14 --- components.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/components.yaml b/components.yaml index 238aeb3c..071afbec 100644 --- a/components.yaml +++ b/components.yaml @@ -56,7 +56,7 @@ MAPL: GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - tag: GCMv12-rc13 + tag: GCMv12-rc14 sparse: ./config/GEOSgcm_GridComp.sparse develop: feature/sdrabenh/gcm_v12 @@ -75,13 +75,13 @@ GigaTraj: FVdycoreCubed_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp remote: ../FVdycoreCubed_GridComp.git - tag: GCMv12-rc13 + tag: GCMv12-rc14 develop: feature/sdrabenh/gcm_v12 fvdycore: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp/@fvdycore remote: ../GFDL_atmos_cubed_sphere.git - tag: GCMv12-rc13 + tag: GCMv12-rc14 develop: feature/sdrabenh/gcm_v12 GEOSchem_GridComp: @@ -214,7 +214,7 @@ sis2: GEOSradiation_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSradiation_GridComp remote: ../GEOSradiation_GridComp.git - tag: GCMv12-rc13 + tag: GCMv12-rc14 develop: feature/sdrabenh/gcm_v12 RRTMGP: @@ -239,7 +239,7 @@ umwm: GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git - tag: GCMv12-rc13 + tag: GCMv12-rc14 develop: feature/sdrabenh/gcm_v12 UMD_Etc: From ad59ade0e4f4c65c1d71500cb71a332b9c2f967e Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst Date: Tue, 6 May 2025 09:36:33 -0400 Subject: [PATCH 112/241] Uptick to GCMv12-rc15 --- components.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components.yaml b/components.yaml index 071afbec..d9d12e53 100644 --- a/components.yaml +++ b/components.yaml @@ -29,7 +29,7 @@ NCEP_Shared: GMAO_Shared: local: ./src/Shared/@GMAO_Shared remote: ../GMAO_Shared.git - tag: GCMv12-rc13 + tag: GCMv12-rc15 sparse: ./config/GMAO_Shared.sparse develop: feature/sdrabenh/gcm_v12 @@ -56,7 +56,7 @@ MAPL: GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - tag: GCMv12-rc14 + tag: GCMv12-rc15 sparse: ./config/GEOSgcm_GridComp.sparse develop: feature/sdrabenh/gcm_v12 From 84fa7ba5da401f9864f401d55461cc26cbb33343 Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst Date: Tue, 6 May 2025 13:24:29 -0400 Subject: [PATCH 113/241] Uptick to GCMv12-rc15 --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index d9d12e53..411312a5 100644 --- a/components.yaml +++ b/components.yaml @@ -239,7 +239,7 @@ umwm: GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git - tag: GCMv12-rc14 + tag: GCMv12-rc15 develop: feature/sdrabenh/gcm_v12 UMD_Etc: From 85249972034a268a6480191233e3824795f2f149 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 13 May 2025 10:41:15 -0400 Subject: [PATCH 114/241] Turn off ifx --- .circleci/config.yml | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bfc8a11f..eafebdfc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -93,25 +93,25 @@ workflows: image_name: geos-env-bcs tag_build_arg_name: *tag_build_arg_name resource_class: xlarge - - ci/publish_docker: - filters: - tags: - only: /^v.*$/ - name: publish-ifx-docker-image - context: - - docker-hub-creds - - ghcr-creds - os_version: *os_version - baselibs_version: *baselibs_version - bcs_version: *bcs_version - container_name: geosgcm - mpi_name: intelmpi - mpi_version: "2021.14" - compiler_name: ifx - compiler_version: "2025.0" - image_name: geos-env-bcs - tag_build_arg_name: *tag_build_arg_name - resource_class: xlarge + #- ci/publish_docker: + #filters: + #tags: + #only: /^v.*$/ + #name: publish-ifx-docker-image + #context: + #- docker-hub-creds + #- ghcr-creds + #os_version: *os_version + #baselibs_version: *baselibs_version + #bcs_version: *bcs_version + #container_name: geosgcm + #mpi_name: intelmpi + #mpi_version: "2021.14" + #compiler_name: ifx + #compiler_version: "2025.0" + #image_name: geos-env-bcs + #tag_build_arg_name: *tag_build_arg_name + #resource_class: xlarge - ci/publish_docker: filters: tags: From 4cf1f4052847bf07a593ae05febdda9673af0440 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 13 May 2025 14:22:13 -0400 Subject: [PATCH 115/241] Update to ecbuild geos/v2.1.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5d66041e..3141b8e0 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ | [CARMA](https://github.com/GEOS-ESM/CARMA) | [v1.1.0](https://github.com/GEOS-ESM/CARMA/releases/tag/v1.1.0) | | [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/v2.0.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv2.0.0) | +| [ecbuild](https://github.com/GEOS-ESM/ecbuild) | [geos/v2.1.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv2.1.0) | | [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.18.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.18.0) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.12.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.12.0) | | [FMS](https://github.com/GEOS-ESM/FMS) | [geos/2019.01.02+noaff.10](https://github.com/GEOS-ESM/FMS/releases/tag/geos%2F2019.01.02%2Bnoaff.10) | diff --git a/components.yaml b/components.yaml index 0e6da0f3..2dd481f6 100644 --- a/components.yaml +++ b/components.yaml @@ -17,7 +17,7 @@ cmake: ecbuild: local: ./@cmake/@ecbuild remote: ../ecbuild.git - tag: geos/v2.0.0 + tag: geos/v2.1.0 NCEP_Shared: local: ./src/Shared/@NCEP_Shared From 1b9c079ac23c1dcf9a72b21ae02bd727679c2e60 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 14 May 2025 08:33:15 -0400 Subject: [PATCH 116/241] Update to GMAO_Shared GCMv12-rc16 --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index 2dd481f6..e7ba51c1 100644 --- a/components.yaml +++ b/components.yaml @@ -29,7 +29,7 @@ NCEP_Shared: GMAO_Shared: local: ./src/Shared/@GMAO_Shared remote: ../GMAO_Shared.git - tag: GCMv12-rc15 + tag: GCMv12-rc16 sparse: ./config/GMAO_Shared.sparse develop: feature/sdrabenh/gcm_v12 From f8d72ee98ad012d0a6be1e54cac59fb51ae30492 Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst Date: Wed, 14 May 2025 16:45:27 -0400 Subject: [PATCH 117/241] Uptick to GCMv12-rc16 --- components.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components.yaml b/components.yaml index 411312a5..e75c8ded 100644 --- a/components.yaml +++ b/components.yaml @@ -29,7 +29,7 @@ NCEP_Shared: GMAO_Shared: local: ./src/Shared/@GMAO_Shared remote: ../GMAO_Shared.git - tag: GCMv12-rc15 + tag: GCMv12-rc16 sparse: ./config/GMAO_Shared.sparse develop: feature/sdrabenh/gcm_v12 @@ -56,7 +56,7 @@ MAPL: GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - tag: GCMv12-rc15 + tag: GCMv12-rc16 sparse: ./config/GEOSgcm_GridComp.sparse develop: feature/sdrabenh/gcm_v12 @@ -105,7 +105,7 @@ geos-chem: GOCART: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@GOCART remote: ../GOCART.git - tag: GCMv12-rc13 + tag: GCMv12-rc16 develop: feature/sdrabenh/gcm_v12 QuickChem: From a188a33321fcc743fcdbb625d1e476a70af5fafe Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst Date: Thu, 15 May 2025 09:15:28 -0400 Subject: [PATCH 118/241] Uptick to fvdycore to GCMv12-rc16 tag --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index e75c8ded..dbe9a799 100644 --- a/components.yaml +++ b/components.yaml @@ -81,7 +81,7 @@ FVdycoreCubed_GridComp: fvdycore: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp/@fvdycore remote: ../GFDL_atmos_cubed_sphere.git - tag: GCMv12-rc14 + tag: GCMv12-rc16 develop: feature/sdrabenh/gcm_v12 GEOSchem_GridComp: From bfaac49259641cca749f4875c52542ccef230304 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 21 May 2025 09:20:52 -0400 Subject: [PATCH 119/241] v12: Remove support for mom5 This is one of a set of PRs to remove support for MOM5 in GEOSgcm v12. There are PRs in: * GEOSgcm: * GEOS_OceanGridComp: * GEOSgcm_App: --- README.md | 1 - components.yaml | 6 ------ 2 files changed, 7 deletions(-) diff --git a/README.md b/README.md index d3a09762..82b22672 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,6 @@ | [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.55.0](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.55.0) | | [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.5](https://github.com/GEOS-ESM/MOM6/tree/geos/v3.5) | | [NCEP_Shared](https://github.com/GEOS-ESM/NCEP_Shared) | [v1.4.0](https://github.com/GEOS-ESM/NCEP_Shared/releases/tag/v1.4.0) | | [QuickChem](https://github.com/GEOS-ESM/QuickChem) | [v1.0.0](https://github.com/GEOS-ESM/QuickChem/releases/tag/v1.0.0) | diff --git a/components.yaml b/components.yaml index dbe9a799..ab2cf621 100644 --- a/components.yaml +++ b/components.yaml @@ -174,12 +174,6 @@ GEOS_OceanGridComp: tag: v3.5.0 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 From c3766ebf2304b8dab8ee98e4f6f0486fcbe2acfe Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 21 May 2025 09:46:00 -0400 Subject: [PATCH 120/241] Use branches for Ocean and App --- components.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/components.yaml b/components.yaml index ab2cf621..37782670 100644 --- a/components.yaml +++ b/components.yaml @@ -171,7 +171,8 @@ ACHEM: GEOS_OceanGridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp remote: ../GEOS_OceanGridComp.git - tag: v3.5.0 + #tag: v3.5.0 + branch: feature/v12-remove-mom5 develop: develop mom6: @@ -233,7 +234,8 @@ umwm: GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git - tag: GCMv12-rc15 + #tag: GCMv12-rc15 + branch: feature/v12-remove-mom5 develop: feature/sdrabenh/gcm_v12 UMD_Etc: From e0ffc0d7b918ea271f721728f8dc6c4fbe065f3d Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 22 May 2025 08:30:13 -0400 Subject: [PATCH 121/241] Update to ESMA_cmake v4.18.1 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3141b8e0..cbb36277 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ | [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/v2.1.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv2.1.0) | -| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.18.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.18.0) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.18.1](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.18.1) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.12.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.12.0) | | [FMS](https://github.com/GEOS-ESM/FMS) | [geos/2019.01.02+noaff.10](https://github.com/GEOS-ESM/FMS/releases/tag/geos%2F2019.01.02%2Bnoaff.10) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.14.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.14.0) | diff --git a/components.yaml b/components.yaml index 9be2f3f6..c4488a2c 100644 --- a/components.yaml +++ b/components.yaml @@ -11,7 +11,7 @@ env: cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v4.18.0 + tag: v4.18.1 develop: develop ecbuild: From b9b0540e4bdfd7392ba6ef68843c37649da4c5b0 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 23 May 2025 09:53:35 -0400 Subject: [PATCH 122/241] Update to MAPL 2.56.0 --- CMakeLists.txt | 2 +- README.md | 2 +- components.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 16a34dd2..54c054ef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -94,7 +94,7 @@ if (NOT Baselibs_FOUND) target_link_libraries(FMS::fms_r8 INTERFACE ${LIBYAML_LIBRARIES}) endif () - find_package(MAPL 2.55 QUIET) + find_package(MAPL 2.56 QUIET) if (MAPL_FOUND) message(STATUS "Found MAPL: ${MAPL_BASE_DIR} (found version \"${MAPL_VERSION})\"") endif () diff --git a/README.md b/README.md index cbb36277..a64252a5 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ | [HEMCO](https://github.com/GEOS-ESM/HEMCO) | [geos/v2.3.0](https://github.com/GEOS-ESM/HEMCO/releases/tag/geos%2Fv2.3.0) | | [Icepack](https://github.com/GEOS-ESM/Icepack) | [geos/v0.3.0](https://github.com/GEOS-ESM/Icepack/releases/tag/geos%2Fv0.3.0) | | [MAM](https://github.com/GEOS-ESM/MAM) | [v1.0.0](https://github.com/GEOS-ESM/MAM/releases/tag/v1.0.0) | -| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.55.0](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.55.0) | +| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.56.0](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.56.0) | | [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) | diff --git a/components.yaml b/components.yaml index c4488a2c..d4db3d40 100644 --- a/components.yaml +++ b/components.yaml @@ -50,7 +50,7 @@ GMAO_perllib: MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - tag: GCMv12-rc13 + tag: v2.56.0 develop: feature/sdrabenh/gcm_v12 GEOSgcm_GridComp: From 13e471edebfcd5bbe271415e454d9705fbb65ade Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 1 Jul 2025 11:32:10 -0400 Subject: [PATCH 123/241] v12: Fixes for CI --- .github/workflows/spack-ci.yml | 3 +-- .github/workflows/workflow.yml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/spack-ci.yml b/.github/workflows/spack-ci.yml index 9655b6b4..6661e294 100644 --- a/.github/workflows/spack-ci.yml +++ b/.github/workflows/spack-ci.yml @@ -43,8 +43,7 @@ jobs: mepo status - name: Update other branches - if: - "!contains('refs/heads/main,refs/heads/develop', github.ref)" + if: ${{ github.event.pull_request.head.ref != 'main' && github.event.pull_request.head.ref != 'develop' }} run: | mepo checkout-if-exists ${GITHUB_HEAD_REF} mepo status diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 0cbded29..76df6dd5 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -63,8 +63,7 @@ jobs: mepo status - name: Update other branches - if: - "!contains('refs/heads/main,refs/heads/develop', github.ref)" + if: ${{ github.event.pull_request.head.ref != 'main' && github.event.pull_request.head.ref != 'develop' }} run: | mepo checkout-if-exists ${GITHUB_HEAD_REF} mepo status From 172c21f778047a5a5479d5c7983a075e457a6359 Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst Date: Tue, 1 Jul 2025 13:16:16 -0400 Subject: [PATCH 124/241] uptick MAPL to v2.57.0 --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index d4db3d40..82c84897 100644 --- a/components.yaml +++ b/components.yaml @@ -50,7 +50,7 @@ GMAO_perllib: MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - tag: v2.56.0 + tag: v2.57.0 develop: feature/sdrabenh/gcm_v12 GEOSgcm_GridComp: From 2f720282b02583ca43c7420ad343ef7c40c1f0b7 Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst Date: Wed, 2 Jul 2025 12:08:37 -0400 Subject: [PATCH 125/241] Uptick to tag GCMv12-rc17 --- components.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/components.yaml b/components.yaml index 82c84897..0a9fbb30 100644 --- a/components.yaml +++ b/components.yaml @@ -29,14 +29,14 @@ NCEP_Shared: GMAO_Shared: local: ./src/Shared/@GMAO_Shared remote: ../GMAO_Shared.git - tag: GCMv12-rc16 + tag: GCMv12-rc17 sparse: ./config/GMAO_Shared.sparse develop: feature/sdrabenh/gcm_v12 GEOS_Util: local: ./src/Shared/@GMAO_Shared/@GEOS_Util remote: ../GEOS_Util.git - tag: GCMv12-rc13 + tag: GCMv12-rc17 develop: feature/sdrabenh/gcm_v12 GMAO_perllib: @@ -56,7 +56,7 @@ MAPL: GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - tag: GCMv12-rc16 + tag: GCMv12-rc17 sparse: ./config/GEOSgcm_GridComp.sparse develop: feature/sdrabenh/gcm_v12 @@ -75,7 +75,7 @@ GigaTraj: FVdycoreCubed_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp remote: ../FVdycoreCubed_GridComp.git - tag: GCMv12-rc14 + tag: GCMv12-rc17 develop: feature/sdrabenh/gcm_v12 fvdycore: @@ -105,7 +105,7 @@ geos-chem: GOCART: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@GOCART remote: ../GOCART.git - tag: GCMv12-rc16 + tag: GCMv12-rc17 develop: feature/sdrabenh/gcm_v12 QuickChem: @@ -239,7 +239,7 @@ umwm: GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git - tag: GCMv12-rc15 + tag: GCMv12-rc17 develop: feature/sdrabenh/gcm_v12 UMD_Etc: From d0d78e159d30f9b367f311b20cbebab34b722f64 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 2 Jul 2025 15:10:42 -0400 Subject: [PATCH 126/241] v12: Move to mapl develop develop --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index 0a9fbb30..59580c52 100644 --- a/components.yaml +++ b/components.yaml @@ -51,7 +51,7 @@ MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git tag: v2.57.0 - develop: feature/sdrabenh/gcm_v12 + develop: develop GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp From adc745417635662b409844d2ffc289f876e3a130 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 3 Jul 2025 12:26:13 -0400 Subject: [PATCH 127/241] v12: Update to mom6 geos/v3.6 and Ocean GC v3.6.0 --- README.md | 4 ++-- components.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index ef8e25fd..06a3a561 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.14.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.14.1) | | [GAAS](https://github.com/GEOS-ESM/GAAS) | [v1.0.0](https://github.com/GEOS-ESM/GAAS/releases/tag/v1.0.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) | -| [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v2.5.0](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v2.5.0) | +| [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v3.6.0](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v3.6.0) | | [GEOS_Util](https://github.com/GEOS-ESM/GEOS_Util) | [v2.1.8](https://github.com/GEOS-ESM/GEOS_Util/releases/tag/v2.1.8) | | [geos_state_bias](https://github.com/GEOS-ESM/geos_state_bias) | [geos/v1.0.0](https://github.com/GEOS-ESM/geos_state_bias/releases/tag/geos/v1.0.0) | | [GEOSchem_GridComp](https://github.com/GEOS-ESM/GEOSchem_GridComp) | [v1.16.0](https://github.com/GEOS-ESM/GEOSchem_GridComp/releases/tag/v1.16.0) | @@ -42,7 +42,7 @@ | [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.5](https://github.com/GEOS-ESM/MOM6/tree/geos/v3.5) | +| [MOM6](https://github.com/GEOS-ESM/MOM6) | [geos/v3.6](https://github.com/GEOS-ESM/MOM6/tree/geos/v3.6) | | [NCEP_Shared](https://github.com/GEOS-ESM/NCEP_Shared) | [v1.4.0](https://github.com/GEOS-ESM/NCEP_Shared/releases/tag/v1.4.0) | | [QuickChem](https://github.com/GEOS-ESM/QuickChem) | [v1.0.0](https://github.com/GEOS-ESM/QuickChem/releases/tag/v1.0.0) | | [RRG](https://github.com/GEOS-ESM/RRG) | [v1.1.0](https://github.com/GEOS-ESM/RRG/releases/tag/v1.1.0) | diff --git a/components.yaml b/components.yaml index 0a9fbb30..d597b954 100644 --- a/components.yaml +++ b/components.yaml @@ -171,7 +171,7 @@ ACHEM: GEOS_OceanGridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp remote: ../GEOS_OceanGridComp.git - tag: v3.5.0 + tag: v3.6.0 develop: develop mom: @@ -183,7 +183,7 @@ mom: mom6: local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp/MOM6_GEOSPlug/@mom6 remote: ../MOM6.git - tag: geos/v3.5 + tag: geos/v3.6 develop: geos/main recurse_submodules: true From b1e215b30c3d47dc33e71e486044c4d7a897d1e3 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 3 Jul 2025 14:44:16 -0400 Subject: [PATCH 128/241] v12: Update to ESMA_cmake v4.19.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ef8e25fd..f62fbcbf 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ | [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/v2.1.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv2.1.0) | -| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.18.1](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.18.1) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.19.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.19.0) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.12.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.12.0) | | [FMS](https://github.com/GEOS-ESM/FMS) | [geos/2019.01.02+noaff.10](https://github.com/GEOS-ESM/FMS/releases/tag/geos%2F2019.01.02%2Bnoaff.10) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.14.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.14.1) | diff --git a/components.yaml b/components.yaml index 0a9fbb30..b15062ed 100644 --- a/components.yaml +++ b/components.yaml @@ -11,7 +11,7 @@ env: cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v4.18.1 + tag: v4.19.0 develop: develop ecbuild: From 379075d43a4e55f271b62664bf37b40528f20116 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 8 Jul 2025 08:50:33 -0400 Subject: [PATCH 129/241] Update to ESMA_cmake v4.19.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b8fad08b..455e3a11 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ | [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/v2.1.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv2.1.0) | -| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.18.1](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.18.1) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.19.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.19.0) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.12.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.12.0) | | [FMS](https://github.com/GEOS-ESM/FMS) | [geos/2019.01.02+noaff.10](https://github.com/GEOS-ESM/FMS/releases/tag/geos%2F2019.01.02%2Bnoaff.10) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.14.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.14.1) | diff --git a/components.yaml b/components.yaml index 601747bf..13998b10 100644 --- a/components.yaml +++ b/components.yaml @@ -11,7 +11,7 @@ env: cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v4.18.1 + tag: v4.19.0 develop: develop ecbuild: From 9ada937e656909ec38c5791c693f687fbc5e4e3a Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 8 Jul 2025 08:51:42 -0400 Subject: [PATCH 130/241] Update oceans --- README.md | 4 ++-- components.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 455e3a11..9ed0a605 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.14.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.14.1) | | [GAAS](https://github.com/GEOS-ESM/GAAS) | [v1.0.0](https://github.com/GEOS-ESM/GAAS/releases/tag/v1.0.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) | -| [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v2.5.0](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v2.5.0) | +| [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v3.6.0](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v3.6.0) | | [GEOS_Util](https://github.com/GEOS-ESM/GEOS_Util) | [v2.1.8](https://github.com/GEOS-ESM/GEOS_Util/releases/tag/v2.1.8) | | [geos_state_bias](https://github.com/GEOS-ESM/geos_state_bias) | [geos/v1.0.0](https://github.com/GEOS-ESM/geos_state_bias/releases/tag/geos/v1.0.0) | | [GEOSchem_GridComp](https://github.com/GEOS-ESM/GEOSchem_GridComp) | [v1.16.0](https://github.com/GEOS-ESM/GEOSchem_GridComp/releases/tag/v1.16.0) | @@ -41,7 +41,7 @@ | [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.56.0](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.56.0) | | [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) | -| [MOM6](https://github.com/GEOS-ESM/MOM6) | [geos/v3.5](https://github.com/GEOS-ESM/MOM6/tree/geos/v3.5) | +| [MOM6](https://github.com/GEOS-ESM/MOM6) | [geos/v3.6](https://github.com/GEOS-ESM/MOM6/tree/geos/v3.6) | | [NCEP_Shared](https://github.com/GEOS-ESM/NCEP_Shared) | [v1.4.0](https://github.com/GEOS-ESM/NCEP_Shared/releases/tag/v1.4.0) | | [QuickChem](https://github.com/GEOS-ESM/QuickChem) | [v1.0.0](https://github.com/GEOS-ESM/QuickChem/releases/tag/v1.0.0) | | [RRG](https://github.com/GEOS-ESM/RRG) | [v1.1.0](https://github.com/GEOS-ESM/RRG/releases/tag/v1.1.0) | diff --git a/components.yaml b/components.yaml index 13998b10..2b78d3a0 100644 --- a/components.yaml +++ b/components.yaml @@ -171,14 +171,14 @@ ACHEM: GEOS_OceanGridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp remote: ../GEOS_OceanGridComp.git - #tag: v3.5.0 + #tag: v3.6.0 branch: feature/v12-remove-mom5 develop: develop mom6: local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp/MOM6_GEOSPlug/@mom6 remote: ../MOM6.git - tag: geos/v3.5 + tag: geos/v3.6 develop: geos/main recurse_submodules: true From e72bcef5e5bf07a9dcf18b498b0b43268e3b791f Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 8 Jul 2025 11:38:30 -0400 Subject: [PATCH 131/241] Update the FV versions --- components.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/components.yaml b/components.yaml index 2b78d3a0..dc619422 100644 --- a/components.yaml +++ b/components.yaml @@ -11,7 +11,7 @@ env: cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v4.19.0 + tag: v4.19.1 develop: develop ecbuild: @@ -75,13 +75,15 @@ GigaTraj: FVdycoreCubed_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp remote: ../FVdycoreCubed_GridComp.git - tag: GCMv12-rc17 + #tag: GCMv12-rc17 + branch: feature/v12-fms2025-useifdef develop: feature/sdrabenh/gcm_v12 fvdycore: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp/@fvdycore remote: ../GFDL_atmos_cubed_sphere.git - tag: GCMv12-rc16 + #tag: GCMv12-rc16 + branch: feature/v12-fms2025-useifdef develop: feature/sdrabenh/gcm_v12 GEOSchem_GridComp: From 8598b11067df498234b0f712e8f1aa58af996ba6 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 8 Jul 2025 12:01:32 -0400 Subject: [PATCH 132/241] Update to ESMA_cmake v4.19.1 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f62fbcbf..1a93e857 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ | [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/v2.1.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv2.1.0) | -| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.19.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.19.0) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.19.1](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.19.1) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.12.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.12.0) | | [FMS](https://github.com/GEOS-ESM/FMS) | [geos/2019.01.02+noaff.10](https://github.com/GEOS-ESM/FMS/releases/tag/geos%2F2019.01.02%2Bnoaff.10) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.14.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.14.1) | diff --git a/components.yaml b/components.yaml index b15062ed..adc9812d 100644 --- a/components.yaml +++ b/components.yaml @@ -11,7 +11,7 @@ env: cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v4.19.0 + tag: v4.19.1 develop: develop ecbuild: From 295967fdcee6425c133ea3c001296ff034e7b136 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 17 Jul 2025 16:20:40 -0400 Subject: [PATCH 133/241] v12: Update to ESMA_cmake v4.19.2 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1a93e857..4a8b052a 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ | [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/v2.1.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv2.1.0) | -| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.19.1](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.19.1) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.19.2](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.19.2) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.12.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.12.0) | | [FMS](https://github.com/GEOS-ESM/FMS) | [geos/2019.01.02+noaff.10](https://github.com/GEOS-ESM/FMS/releases/tag/geos%2F2019.01.02%2Bnoaff.10) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.14.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.14.1) | diff --git a/components.yaml b/components.yaml index adc9812d..619f4d6b 100644 --- a/components.yaml +++ b/components.yaml @@ -11,7 +11,7 @@ env: cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v4.19.1 + tag: v4.19.2 develop: develop ecbuild: From 5180b3e47a344d7716d7c84ad6d1719ce77a66e0 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 17 Jul 2025 16:43:02 -0400 Subject: [PATCH 134/241] v12: Update to MAPL 2.58.0 --- CMakeLists.txt | 2 +- README.md | 2 +- components.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 54c054ef..f7e7e8b0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -94,7 +94,7 @@ if (NOT Baselibs_FOUND) target_link_libraries(FMS::fms_r8 INTERFACE ${LIBYAML_LIBRARIES}) endif () - find_package(MAPL 2.56 QUIET) + find_package(MAPL 2.58 QUIET) if (MAPL_FOUND) message(STATUS "Found MAPL: ${MAPL_BASE_DIR} (found version \"${MAPL_VERSION})\"") endif () diff --git a/README.md b/README.md index 4a8b052a..bc968839 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ | [HEMCO](https://github.com/GEOS-ESM/HEMCO) | [geos/v2.3.0](https://github.com/GEOS-ESM/HEMCO/releases/tag/geos%2Fv2.3.0) | | [Icepack](https://github.com/GEOS-ESM/Icepack) | [geos/v0.3.0](https://github.com/GEOS-ESM/Icepack/releases/tag/geos%2Fv0.3.0) | | [MAM](https://github.com/GEOS-ESM/MAM) | [v1.0.0](https://github.com/GEOS-ESM/MAM/releases/tag/v1.0.0) | -| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.56.0](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.56.0) | +| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.58.0](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.58.0) | | [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) | diff --git a/components.yaml b/components.yaml index 619f4d6b..39b3c33e 100644 --- a/components.yaml +++ b/components.yaml @@ -50,7 +50,7 @@ GMAO_perllib: MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - tag: v2.57.0 + tag: v2.58.0 develop: feature/sdrabenh/gcm_v12 GEOSgcm_GridComp: From e6b4b3811fb673e19c6550b88420546ecb2f1a30 Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst Date: Fri, 18 Jul 2025 00:48:09 -0400 Subject: [PATCH 135/241] Uptick to GCMv12-rc18 --- components.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components.yaml b/components.yaml index 39b3c33e..39909ebb 100644 --- a/components.yaml +++ b/components.yaml @@ -36,7 +36,7 @@ GMAO_Shared: GEOS_Util: local: ./src/Shared/@GMAO_Shared/@GEOS_Util remote: ../GEOS_Util.git - tag: GCMv12-rc17 + tag: GCMv12-rc18 develop: feature/sdrabenh/gcm_v12 GMAO_perllib: @@ -56,7 +56,7 @@ MAPL: GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - tag: GCMv12-rc17 + tag: GCMv12-rc18 sparse: ./config/GEOSgcm_GridComp.sparse develop: feature/sdrabenh/gcm_v12 @@ -214,7 +214,7 @@ sis2: GEOSradiation_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSradiation_GridComp remote: ../GEOSradiation_GridComp.git - tag: GCMv12-rc14 + tag: GCMv12-rc18 develop: feature/sdrabenh/gcm_v12 RRTMGP: From ad9ae9aeb55ff565e3aca41f7517c8bacc437e9f Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 8 Aug 2025 08:19:58 -0400 Subject: [PATCH 136/241] v12: Update to MAPL 2.59.0 --- CMakeLists.txt | 2 +- README.md | 2 +- components.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f7e7e8b0..5244d27d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -94,7 +94,7 @@ if (NOT Baselibs_FOUND) target_link_libraries(FMS::fms_r8 INTERFACE ${LIBYAML_LIBRARIES}) endif () - find_package(MAPL 2.58 QUIET) + find_package(MAPL 2.59 QUIET) if (MAPL_FOUND) message(STATUS "Found MAPL: ${MAPL_BASE_DIR} (found version \"${MAPL_VERSION})\"") endif () diff --git a/README.md b/README.md index 83cdb46f..ea3a88b3 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ | [HEMCO](https://github.com/GEOS-ESM/HEMCO) | [geos/v2.3.0](https://github.com/GEOS-ESM/HEMCO/releases/tag/geos%2Fv2.3.0) | | [Icepack](https://github.com/GEOS-ESM/Icepack) | [geos/v0.3.0](https://github.com/GEOS-ESM/Icepack/releases/tag/geos%2Fv0.3.0) | | [MAM](https://github.com/GEOS-ESM/MAM) | [v1.0.0](https://github.com/GEOS-ESM/MAM/releases/tag/v1.0.0) | -| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.58.0](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.58.0) | +| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.59.0](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.59.0) | | [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) | diff --git a/components.yaml b/components.yaml index fb7d3c43..d43859df 100644 --- a/components.yaml +++ b/components.yaml @@ -50,7 +50,7 @@ GMAO_perllib: MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - tag: v2.58.0 + tag: v2.59.0 develop: develop GEOSgcm_GridComp: From 8d29a4eaed8db559b9e33e2b9ae7965da6cf7c49 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 26 Aug 2025 12:20:48 -0400 Subject: [PATCH 137/241] v12: Update to mom6 geos/v3.7 and Ocean GC v3.7.0 --- README.md | 4 ++-- components.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 5c5d20cc..76c54a7f 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.14.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.14.1) | | [GAAS](https://github.com/GEOS-ESM/GAAS) | [v1.0.0](https://github.com/GEOS-ESM/GAAS/releases/tag/v1.0.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) | -| [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v3.6.0](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v3.6.0) | +| [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v3.7.0](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v3.7.0) | | [GEOS_Util](https://github.com/GEOS-ESM/GEOS_Util) | [v2.1.8](https://github.com/GEOS-ESM/GEOS_Util/releases/tag/v2.1.8) | | [geos_state_bias](https://github.com/GEOS-ESM/geos_state_bias) | [geos/v1.0.0](https://github.com/GEOS-ESM/geos_state_bias/releases/tag/geos/v1.0.0) | | [GEOSchem_GridComp](https://github.com/GEOS-ESM/GEOSchem_GridComp) | [v1.16.0](https://github.com/GEOS-ESM/GEOSchem_GridComp/releases/tag/v1.16.0) | @@ -42,7 +42,7 @@ | [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.6](https://github.com/GEOS-ESM/MOM6/tree/geos/v3.6) | +| [MOM6](https://github.com/GEOS-ESM/MOM6) | [geos/v3.7](https://github.com/GEOS-ESM/MOM6/tree/geos/v3.7) | | [NCEP_Shared](https://github.com/GEOS-ESM/NCEP_Shared) | [v1.4.0](https://github.com/GEOS-ESM/NCEP_Shared/releases/tag/v1.4.0) | | [QuickChem](https://github.com/GEOS-ESM/QuickChem) | [v1.0.0](https://github.com/GEOS-ESM/QuickChem/releases/tag/v1.0.0) | | [RRG](https://github.com/GEOS-ESM/RRG) | [v1.1.0](https://github.com/GEOS-ESM/RRG/releases/tag/v1.1.0) | diff --git a/components.yaml b/components.yaml index 77061eeb..bc183853 100644 --- a/components.yaml +++ b/components.yaml @@ -171,7 +171,7 @@ ACHEM: GEOS_OceanGridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp remote: ../GEOS_OceanGridComp.git - tag: v3.6.0 + tag: v3.7.0 develop: develop mom: @@ -183,7 +183,7 @@ mom: mom6: local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp/MOM6_GEOSPlug/@mom6 remote: ../MOM6.git - tag: geos/v3.6 + tag: geos/v3.7 develop: geos/main recurse_submodules: true From 28921158773117431fb0f0c6c6a34149ce240c9d Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 26 Aug 2025 12:58:29 -0400 Subject: [PATCH 138/241] v12: Update to ESMA_cmake v4.20.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ea3a88b3..165ed004 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ | [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/v2.1.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv2.1.0) | -| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.19.2](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.19.2) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.20.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.20.0) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.12.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.12.0) | | [FMS](https://github.com/GEOS-ESM/FMS) | [geos/2019.01.02+noaff.10](https://github.com/GEOS-ESM/FMS/releases/tag/geos%2F2019.01.02%2Bnoaff.10) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.14.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.14.1) | diff --git a/components.yaml b/components.yaml index d43859df..9a431534 100644 --- a/components.yaml +++ b/components.yaml @@ -11,7 +11,7 @@ env: cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v4.19.2 + tag: v4.20.0 develop: develop ecbuild: From 87d700562550c59323999b623c5c478f2a29819a Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 3 Sep 2025 08:42:14 -0400 Subject: [PATCH 139/241] v12: Update to Baselibs 8.18.0, ESMA_cmake v4.21.0 --- README.md | 4 ++-- components.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 20833921..73f9d79b 100644 --- a/README.md +++ b/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/v2.1.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv2.1.0) | -| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.20.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.20.0) | -| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.12.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.12.0) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.21.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.21.0) | +| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.13.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.13.0) | | [FMS](https://github.com/GEOS-ESM/FMS) | [geos/2019.01.02+noaff.10](https://github.com/GEOS-ESM/FMS/releases/tag/geos%2F2019.01.02%2Bnoaff.10) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.14.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.14.1) | | [GAAS](https://github.com/GEOS-ESM/GAAS) | [v1.0.0](https://github.com/GEOS-ESM/GAAS/releases/tag/v1.0.0) | diff --git a/components.yaml b/components.yaml index d8ce7abb..f45b1992 100644 --- a/components.yaml +++ b/components.yaml @@ -5,13 +5,13 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v5.12.0 + tag: v5.13.0 develop: main cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v4.20.0 + tag: v4.21.0 develop: develop ecbuild: From 13f7c8175c244390115c182ad30f63860319472b Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 3 Sep 2025 08:46:37 -0400 Subject: [PATCH 140/241] Update CI to Baselibs 8.18.0 --- .circleci/config.yml | 2 +- .github/workflows/workflow.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index acf456e7..0b301e78 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,7 +16,7 @@ parameters: # Anchors to prevent forgetting to update a version os_version: &os_version ubuntu24 -baselibs_version: &baselibs_version v8.14.0 +baselibs_version: &baselibs_version v8.18.0 bcs_version: &bcs_version v12.0.0 tag_build_arg_name: &tag_build_arg_name gcmversion diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index f91bf9f8..66cee1e1 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -23,7 +23,7 @@ jobs: if: "!contains(github.event.pull_request.labels.*.name, '0 diff trivial')" runs-on: ubuntu-24.04 container: - image: gmao/ubuntu24-geos-env:v8.14.0-intelmpi_2021.13-ifort_2021.13 + image: gmao/ubuntu24-geos-env:v8.18.0-intelmpi_2021.13-ifort_2021.13 # Per https://github.com/actions/virtual-environments/issues/1445#issuecomment-713861495 # It seems like we might not need secrets on GitHub Actions which is good for forked # pull requests From 95131fcdce45bab5e2dad43c185b1322289be894 Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst Date: Sat, 6 Sep 2025 07:36:04 -0400 Subject: [PATCH 141/241] Uptick components to rc19 tag --- components.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/components.yaml b/components.yaml index d8ce7abb..b5cf1e0e 100644 --- a/components.yaml +++ b/components.yaml @@ -5,7 +5,7 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v5.12.0 + tag: v5.13.0 develop: main cmake: @@ -29,14 +29,14 @@ NCEP_Shared: GMAO_Shared: local: ./src/Shared/@GMAO_Shared remote: ../GMAO_Shared.git - tag: GCMv12-rc17 + tag: GCMv12-rc19 sparse: ./config/GMAO_Shared.sparse develop: feature/sdrabenh/gcm_v12 GEOS_Util: local: ./src/Shared/@GMAO_Shared/@GEOS_Util remote: ../GEOS_Util.git - tag: GCMv12-rc18 + tag: GCMv12-rc19 develop: feature/sdrabenh/gcm_v12 GMAO_perllib: @@ -56,7 +56,7 @@ MAPL: GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - tag: GCMv12-rc18 + tag: GCMv12-rc19 sparse: ./config/GEOSgcm_GridComp.sparse develop: feature/sdrabenh/gcm_v12 @@ -75,7 +75,7 @@ GigaTraj: FVdycoreCubed_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp remote: ../FVdycoreCubed_GridComp.git - tag: GCMv12-rc17 + tag: GCMv12-rc19 develop: feature/sdrabenh/gcm_v12 fvdycore: @@ -214,7 +214,7 @@ sis2: GEOSradiation_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSradiation_GridComp remote: ../GEOSradiation_GridComp.git - tag: GCMv12-rc18 + tag: GCMv12-rc19 develop: feature/sdrabenh/gcm_v12 RRTMGP: @@ -239,7 +239,7 @@ umwm: GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git - tag: GCMv12-rc17 + tag: GCMv12-rc19 develop: feature/sdrabenh/gcm_v12 UMD_Etc: From 8a01ae546ccf8b863069119dfaeca55f1280658a Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 9 Sep 2025 07:49:13 -0400 Subject: [PATCH 142/241] v12: Update to ACHEM v1.0.1 --- README.md | 2 +- components.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 20833921..29c3cf84 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ | Repository | Version | | ---------- | ------- | -| [ACHEM](https://github.com/GEOS-ESM/ACHEM) | [v1.0.0](https://github.com/GEOS-ESM/ACHEM/releases/tag/v1.0.0) | +| [ACHEM](https://github.com/GEOS-ESM/ACHEM) | [v1.0.1](https://github.com/GEOS-ESM/ACHEM/releases/tag/v1.0.1) | | [CARMA](https://github.com/GEOS-ESM/CARMA) | [v1.1.0](https://github.com/GEOS-ESM/CARMA/releases/tag/v1.1.0) | | [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) | diff --git a/components.yaml b/components.yaml index b5cf1e0e..6e49699b 100644 --- a/components.yaml +++ b/components.yaml @@ -165,8 +165,8 @@ GAAS: ACHEM: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@ACHEM remote: ../ACHEM.git - tag: GCMv12-rc13 - develop: feature/sdrabenh/gcm_v12 + tag: v1.0.1 + develop: develop GEOS_OceanGridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp From cf171f661851e316a00303696ce4eac9fbcde148 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 9 Sep 2025 07:57:47 -0400 Subject: [PATCH 143/241] Update to MAM 1.4.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 29c3cf84..5e20bc5f 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ | [SIS2](https://github.com/GEOS-ESM/SIS2) | [geos/v0.0.1](https://github.com/GEOS-ESM/SIS2/releases/tag/geos%2Fv0.0.1) | | [StratChem](https://github.com/GEOS-ESM/StratChem) | [v1.0.0](https://github.com/GEOS-ESM/StratChem/releases/tag/v1.0.0) | | [TR](https://github.com/GEOS-ESM/TR) | [v1.2.0](https://github.com/GEOS-ESM/TR/releases/tag/v1.2.0) | -| [UMD_Etc](https://github.com/GEOS-ESM/UMD_Etc) | [v1.3.0](https://github.com/GEOS-ESM/UMD_Etc/releases/tag/v1.3.0) | +| [UMD_Etc](https://github.com/GEOS-ESM/UMD_Etc) | [v1.4.0](https://github.com/GEOS-ESM/UMD_Etc/releases/tag/v1.4.0) | | [WW3](https://github.com/GEOS-ESM/WW3) | [v7.14-geos-r1](https://github.com/GEOS-ESM/WW3/releases/tag/v7.14-geos-r1) | | [umwm](https://github.com/GEOS-ESM/umwm) | [v2.0.0-geos-r1](https://github.com/GEOS-ESM/umwm/releases/tag/v2.0.0-geos-r1) | diff --git a/components.yaml b/components.yaml index 6e49699b..0798ba86 100644 --- a/components.yaml +++ b/components.yaml @@ -245,7 +245,7 @@ GEOSgcm_App: UMD_Etc: local: ./src/Applications/@UMD_Etc remote: ../UMD_Etc.git - tag: v1.3.0 + tag: v1.4.0 develop: main CPLFCST_Etc: From 1c7d6174c54f01483c818bc360eb60b659a96c81 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 9 Sep 2025 08:03:25 -0400 Subject: [PATCH 144/241] Update to MAM 1.1.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5e20bc5f..c43b2462 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ | [GOCART](https://github.com/GEOS-ESM/GOCART) | [v2.3.0](https://github.com/GEOS-ESM/GOCART/releases/tag/v2.3.0) | | [HEMCO](https://github.com/GEOS-ESM/HEMCO) | [geos/v2.3.0](https://github.com/GEOS-ESM/HEMCO/releases/tag/geos%2Fv2.3.0) | | [Icepack](https://github.com/GEOS-ESM/Icepack) | [geos/v0.3.0](https://github.com/GEOS-ESM/Icepack/releases/tag/geos%2Fv0.3.0) | -| [MAM](https://github.com/GEOS-ESM/MAM) | [v1.0.0](https://github.com/GEOS-ESM/MAM/releases/tag/v1.0.0) | +| [MAM](https://github.com/GEOS-ESM/MAM) | [v1.1.0](https://github.com/GEOS-ESM/MAM/releases/tag/v1.1.0) | | [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.59.0](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.59.0) | | [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) | diff --git a/components.yaml b/components.yaml index 0798ba86..da10d93a 100644 --- a/components.yaml +++ b/components.yaml @@ -141,7 +141,7 @@ StratChem: MAM: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@MAM remote: ../MAM.git - tag: v1.0.0 + tag: v1.1.0 develop: main MATRIX: From af2849e23c81665df90072a9e1e820fad16c42e5 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 9 Sep 2025 13:35:16 -0400 Subject: [PATCH 145/241] Update to ESMA_cmake v4.22.0 --- .github/workflows/spack-ci.yml | 8 ++++---- README.md | 2 +- components.yaml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/spack-ci.yml b/.github/workflows/spack-ci.yml index e1ef0d05..efad0c64 100644 --- a/.github/workflows/spack-ci.yml +++ b/.github/workflows/spack-ci.yml @@ -26,7 +26,7 @@ jobs: git config --global --add safe.directory '*' - name: Setup Python - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: '3.13' @@ -43,7 +43,8 @@ jobs: mepo status - name: Update other branches - if: ${{ github.event.pull_request.head.ref != 'main' && github.event.pull_request.head.ref != 'develop' }} + if: + "!contains('refs/heads/main,refs/heads/develop', github.ref)" run: | mepo checkout-if-exists ${GITHUB_HEAD_REF} mepo status @@ -76,9 +77,8 @@ jobs: shell: spack-bash {0} run: | spack -e spack-env mirror add geos-buildcache oci://ghcr.io/GEOS-ESM/geos-buildcache - spack -e spack-env mirror set --oci-username ${{ github.actor }} --oci-password "${{ secrets.BUILDCACHE_TOKEN }}" geos-buildcache + spack -e spack-env mirror set --oci-username-variable "${{ secrets.BUILDCACHE_USERNAME }}" --oci-password-variable "${{ secrets.BUILDCACHE_TOKEN }}" geos-buildcache spack -e spack-env mirror list - spack -e spack-env buildcache update-index geos-buildcache spack -e spack-env buildcache list --allarch - name: Concretize diff --git a/README.md b/README.md index d6bf0215..a55f7a8f 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ | [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/v2.1.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv2.1.0) | -| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.21.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.21.0) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.22.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.22.0) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.13.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.13.0) | | [FMS](https://github.com/GEOS-ESM/FMS) | [geos/2019.01.02+noaff.10](https://github.com/GEOS-ESM/FMS/releases/tag/geos%2F2019.01.02%2Bnoaff.10) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.14.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.14.1) | diff --git a/components.yaml b/components.yaml index 4b447451..57cbc747 100644 --- a/components.yaml +++ b/components.yaml @@ -11,7 +11,7 @@ env: cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v4.21.0 + tag: v4.22.0 develop: develop ecbuild: From 814b2371c6ac1c8fcb77ed0cddf31532c4508259 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 11 Sep 2025 14:21:57 -0400 Subject: [PATCH 146/241] v12: Update to MAPL 2.60.0 --- CMakeLists.txt | 2 +- README.md | 2 +- components.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5244d27d..2783aecb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -94,7 +94,7 @@ if (NOT Baselibs_FOUND) target_link_libraries(FMS::fms_r8 INTERFACE ${LIBYAML_LIBRARIES}) endif () - find_package(MAPL 2.59 QUIET) + find_package(MAPL 2.60 QUIET) if (MAPL_FOUND) message(STATUS "Found MAPL: ${MAPL_BASE_DIR} (found version \"${MAPL_VERSION})\"") endif () diff --git a/README.md b/README.md index 20a33c05..ec0bf20d 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ | [HEMCO](https://github.com/GEOS-ESM/HEMCO) | [geos/v2.3.0](https://github.com/GEOS-ESM/HEMCO/releases/tag/geos%2Fv2.3.0) | | [Icepack](https://github.com/GEOS-ESM/Icepack) | [geos/v0.3.0](https://github.com/GEOS-ESM/Icepack/releases/tag/geos%2Fv0.3.0) | | [MAM](https://github.com/GEOS-ESM/MAM) | [v1.1.0](https://github.com/GEOS-ESM/MAM/releases/tag/v1.1.0) | -| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.59.0](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.59.0) | +| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.60.0](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.60.0) | | [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) | diff --git a/components.yaml b/components.yaml index 57cbc747..d79aebf0 100644 --- a/components.yaml +++ b/components.yaml @@ -50,7 +50,7 @@ GMAO_perllib: MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - tag: v2.59.0 + tag: v2.60.0 develop: develop GEOSgcm_GridComp: From ba1097065e26d9c20c0112536df90d932dbea952 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 19 Sep 2025 09:20:45 -0400 Subject: [PATCH 147/241] v12: Update to MAPL 2.61.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ec0bf20d..c861c37e 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ | [HEMCO](https://github.com/GEOS-ESM/HEMCO) | [geos/v2.3.0](https://github.com/GEOS-ESM/HEMCO/releases/tag/geos%2Fv2.3.0) | | [Icepack](https://github.com/GEOS-ESM/Icepack) | [geos/v0.3.0](https://github.com/GEOS-ESM/Icepack/releases/tag/geos%2Fv0.3.0) | | [MAM](https://github.com/GEOS-ESM/MAM) | [v1.1.0](https://github.com/GEOS-ESM/MAM/releases/tag/v1.1.0) | -| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.60.0](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.60.0) | +| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.61.0](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.61.0) | | [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) | diff --git a/components.yaml b/components.yaml index d79aebf0..d90f8539 100644 --- a/components.yaml +++ b/components.yaml @@ -50,7 +50,7 @@ GMAO_perllib: MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - tag: v2.60.0 + tag: v2.61.0 develop: develop GEOSgcm_GridComp: From 933613ffa7987354df5da83c8f044d5b0586eaf4 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 19 Sep 2025 09:23:43 -0400 Subject: [PATCH 148/241] Update cmake --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2783aecb..99f38cf6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -94,7 +94,7 @@ if (NOT Baselibs_FOUND) target_link_libraries(FMS::fms_r8 INTERFACE ${LIBYAML_LIBRARIES}) endif () - find_package(MAPL 2.60 QUIET) + find_package(MAPL 2.61 QUIET) if (MAPL_FOUND) message(STATUS "Found MAPL: ${MAPL_BASE_DIR} (found version \"${MAPL_VERSION})\"") endif () From fff595f17b15301ea37e5fadf37b21766e20502a Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 23 Sep 2025 09:55:50 -0400 Subject: [PATCH 149/241] v12: Update to ESMA_cmake v4.23.0, ESMA_env v5.14.0 --- README.md | 4 ++-- components.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index c861c37e..88b3ea72 100644 --- a/README.md +++ b/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/v2.1.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv2.1.0) | -| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.22.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.22.0) | -| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.13.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.13.0) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.23.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.23.0) | +| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.14.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.14.0) | | [FMS](https://github.com/GEOS-ESM/FMS) | [geos/2019.01.02+noaff.10](https://github.com/GEOS-ESM/FMS/releases/tag/geos%2F2019.01.02%2Bnoaff.10) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.14.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.14.1) | | [GAAS](https://github.com/GEOS-ESM/GAAS) | [v1.0.0](https://github.com/GEOS-ESM/GAAS/releases/tag/v1.0.0) | diff --git a/components.yaml b/components.yaml index d90f8539..5e9c25f3 100644 --- a/components.yaml +++ b/components.yaml @@ -5,13 +5,13 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v5.13.0 + tag: v5.14.0 develop: main cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v4.22.0 + tag: v4.23.0 develop: develop ecbuild: From 6b1698a32b58269255cd97762343bc4d21206252 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 26 Sep 2025 10:47:56 -0400 Subject: [PATCH 150/241] Update CI --- .circleci/config.yml | 2 +- .github/workflows/workflow.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0b301e78..7fd8f29c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,7 +16,7 @@ parameters: # Anchors to prevent forgetting to update a version os_version: &os_version ubuntu24 -baselibs_version: &baselibs_version v8.18.0 +baselibs_version: &baselibs_version v8.19.0 bcs_version: &bcs_version v12.0.0 tag_build_arg_name: &tag_build_arg_name gcmversion diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 66cee1e1..26742e1d 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -23,7 +23,7 @@ jobs: if: "!contains(github.event.pull_request.labels.*.name, '0 diff trivial')" runs-on: ubuntu-24.04 container: - image: gmao/ubuntu24-geos-env:v8.18.0-intelmpi_2021.13-ifort_2021.13 + image: gmao/ubuntu24-geos-env:v8.19.0-intelmpi_2021.13-ifort_2021.13 # Per https://github.com/actions/virtual-environments/issues/1445#issuecomment-713861495 # It seems like we might not need secrets on GitHub Actions which is good for forked # pull requests From 5430ef317880d703161faf04dfaf5155f01271ff Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 26 Sep 2025 12:47:16 -0400 Subject: [PATCH 151/241] v12: Update to ESMA_cmake v4.23.1 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 88b3ea72..ad84d2e7 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ | [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/v2.1.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv2.1.0) | -| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.23.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.23.0) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.23.1](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.23.1) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.14.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.14.0) | | [FMS](https://github.com/GEOS-ESM/FMS) | [geos/2019.01.02+noaff.10](https://github.com/GEOS-ESM/FMS/releases/tag/geos%2F2019.01.02%2Bnoaff.10) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.14.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.14.1) | diff --git a/components.yaml b/components.yaml index 5e9c25f3..ca9dff36 100644 --- a/components.yaml +++ b/components.yaml @@ -11,7 +11,7 @@ env: cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v4.23.0 + tag: v4.23.1 develop: develop ecbuild: From 98360a0cfc98393ba3a8905e65261c04f0a873af Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 2 Oct 2025 08:16:13 -0400 Subject: [PATCH 152/241] Update to ESMA_cmake v4.24.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ad84d2e7..8ab92f6e 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ | [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/v2.1.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv2.1.0) | -| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.23.1](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.23.1) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.24.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.24.0) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.14.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.14.0) | | [FMS](https://github.com/GEOS-ESM/FMS) | [geos/2019.01.02+noaff.10](https://github.com/GEOS-ESM/FMS/releases/tag/geos%2F2019.01.02%2Bnoaff.10) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.14.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.14.1) | diff --git a/components.yaml b/components.yaml index ca9dff36..a01ed54f 100644 --- a/components.yaml +++ b/components.yaml @@ -11,7 +11,7 @@ env: cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v4.23.1 + tag: v4.24.0 develop: develop ecbuild: From 82aff10e662bbf2e3ea3a1e44638502bfcfaf079 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 2 Oct 2025 09:47:12 -0400 Subject: [PATCH 153/241] v12: Update to ESMA_cmake v4.25.0, ESMA_env v5.15.0 --- README.md | 4 ++-- components.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 8ab92f6e..621b2e31 100644 --- a/README.md +++ b/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/v2.1.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv2.1.0) | -| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.24.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.24.0) | -| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.14.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.14.0) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.25.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.25.0) | +| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.15.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.15.0) | | [FMS](https://github.com/GEOS-ESM/FMS) | [geos/2019.01.02+noaff.10](https://github.com/GEOS-ESM/FMS/releases/tag/geos%2F2019.01.02%2Bnoaff.10) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.14.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.14.1) | | [GAAS](https://github.com/GEOS-ESM/GAAS) | [v1.0.0](https://github.com/GEOS-ESM/GAAS/releases/tag/v1.0.0) | diff --git a/components.yaml b/components.yaml index a01ed54f..7216e04d 100644 --- a/components.yaml +++ b/components.yaml @@ -5,13 +5,13 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v5.14.0 + tag: v5.15.0 develop: main cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v4.24.0 + tag: v4.25.0 develop: develop ecbuild: From 3955cdab6e9836fb813389c14ca5c17756667314 Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst Date: Thu, 2 Oct 2025 11:53:07 -0400 Subject: [PATCH 154/241] Update to GCMv12-rc20 --- components.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/components.yaml b/components.yaml index d90f8539..1bc1ee59 100644 --- a/components.yaml +++ b/components.yaml @@ -5,13 +5,13 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v5.13.0 + tag: v5.15.0 develop: main cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v4.22.0 + tag: v4.25.0 develop: develop ecbuild: @@ -29,14 +29,14 @@ NCEP_Shared: GMAO_Shared: local: ./src/Shared/@GMAO_Shared remote: ../GMAO_Shared.git - tag: GCMv12-rc19 + tag: GCMv12-rc20 sparse: ./config/GMAO_Shared.sparse develop: feature/sdrabenh/gcm_v12 GEOS_Util: local: ./src/Shared/@GMAO_Shared/@GEOS_Util remote: ../GEOS_Util.git - tag: GCMv12-rc19 + tag: GCMv12-rc20 develop: feature/sdrabenh/gcm_v12 GMAO_perllib: @@ -56,7 +56,7 @@ MAPL: GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - tag: GCMv12-rc19 + tag: GCMv12-rc20 sparse: ./config/GEOSgcm_GridComp.sparse develop: feature/sdrabenh/gcm_v12 @@ -75,13 +75,13 @@ GigaTraj: FVdycoreCubed_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp remote: ../FVdycoreCubed_GridComp.git - tag: GCMv12-rc19 + tag: GCMv12-rc20 develop: feature/sdrabenh/gcm_v12 fvdycore: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp/@fvdycore remote: ../GFDL_atmos_cubed_sphere.git - tag: GCMv12-rc16 + tag: GCMv12-rc20 develop: feature/sdrabenh/gcm_v12 GEOSchem_GridComp: @@ -105,7 +105,7 @@ geos-chem: GOCART: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@GOCART remote: ../GOCART.git - tag: GCMv12-rc17 + tag: GCMv12-rc20 develop: feature/sdrabenh/gcm_v12 QuickChem: @@ -214,7 +214,7 @@ sis2: GEOSradiation_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSradiation_GridComp remote: ../GEOSradiation_GridComp.git - tag: GCMv12-rc19 + tag: GCMv12-rc20 develop: feature/sdrabenh/gcm_v12 RRTMGP: @@ -239,7 +239,7 @@ umwm: GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git - tag: GCMv12-rc19 + tag: GCMv12-rc20 develop: feature/sdrabenh/gcm_v12 UMD_Etc: From 3e18179500c7efc92654406074f31945652fd192 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 7 Oct 2025 11:51:55 -0400 Subject: [PATCH 155/241] v12: Update CI to reusable workflows --- .github/workflows/spack-ci.yml | 109 --------------------------------- .github/workflows/workflow.yml | 71 +++++---------------- 2 files changed, 14 insertions(+), 166 deletions(-) delete mode 100644 .github/workflows/spack-ci.yml diff --git a/.github/workflows/spack-ci.yml b/.github/workflows/spack-ci.yml deleted file mode 100644 index efad0c64..00000000 --- a/.github/workflows/spack-ci.yml +++ /dev/null @@ -1,109 +0,0 @@ -name: Spack CI GCC Build - -on: - pull_request: - types: [opened, synchronize, reopened] - workflow_dispatch: - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: ${{ github.ref != 'refs/heads/main' }} - -jobs: - build_gcm: - name: Spack CI GCC Build - runs-on: ubuntu-24.04 - steps: - - - name: Checkout GCM - uses: actions/checkout@v5 - with: - fetch-depth: 1 - filter: blob:none - - - name: Set all directories as git safe - run: | - git config --global --add safe.directory '*' - - - name: Setup Python - uses: actions/setup-python@v6 - with: - python-version: '3.13' - - - name: Pip install mepo - run: | - python -m pip install --upgrade pip - pip install mepo - mepo --version - - - name: Mepo clone external repos - run: | - ls - mepo clone --partial blobless - mepo status - - - name: Update other branches - if: - "!contains('refs/heads/main,refs/heads/develop', github.ref)" - run: | - mepo checkout-if-exists ${GITHUB_HEAD_REF} - mepo status - - - name: Set up Spack - uses: spack/setup-spack@v2 - with: - ref: develop # Spack version (examples: develop, releases/v0.21) - color: true # Force color output (SPACK_COLOR=always) - path: spack # Where to clone Spack - buildcache: false # Do not use the spack buildcache - - - name: Find compilers - shell: spack-bash {0} - run: | - spack compiler find - - - name: Set default compiler and target - shell: spack-bash {0} - run: | - spack config add 'packages:all:require:target=x86_64_v3' - - - name: Create Spack environment - shell: spack-bash {0} - run: | - spack env create spack-env - spack env activate spack-env - - - name: Login - shell: spack-bash {0} - run: | - spack -e spack-env mirror add geos-buildcache oci://ghcr.io/GEOS-ESM/geos-buildcache - spack -e spack-env mirror set --oci-username-variable "${{ secrets.BUILDCACHE_USERNAME }}" --oci-password-variable "${{ secrets.BUILDCACHE_TOKEN }}" geos-buildcache - spack -e spack-env mirror list - spack -e spack-env buildcache list --allarch - - - name: Concretize - shell: spack-bash {0} - run: | - spack -e spack-env concretize - - - name: Install - shell: spack-bash {0} - run: | - spack clean -m - spack -e spack-env install --add --no-check-signature --use-buildcache only \ - esmf gftl gftl-shared fargparse pflogger pfunit yafyaml ecbuild udunits openblas \ - fms@2024.03 ~gfs_phys +pic constants=GEOS precision=32,64 +deprecated_io ~yaml - - - name: Build with Cmake - shell: spack-bash {0} - run: | - spack env activate spack-env - spack load \ - esmf gftl gftl-shared fargparse pflogger pfunit yafyaml ecbuild udunits openblas \ - fms@2024.03 ~gfs_phys +pic constants=GEOS precision=32,64 +deprecated_io ~yaml - spack find --loaded - FC=gfortran-14 CC=gcc-14 CXX=g++-14 - cmake -B build -S . -DCMAKE_INSTALL_PREFIX=$PWD/install -DCMAKE_BUILD_TYPE=Debug -DUSE_F2PY=OFF -DCMAKE_Fortran_COMPILER=${FC} -DCMAKE_C_COMPILER=${CC} -DCMAKE_CXX_COMPILER=${CXX} - cmake --build build -j 4 - cmake --install build - diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 26742e1d..8be10d0c 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -19,60 +19,17 @@ concurrency: jobs: build_gcm: - name: Build GEOSgcm - if: "!contains(github.event.pull_request.labels.*.name, '0 diff trivial')" - runs-on: ubuntu-24.04 - container: - image: gmao/ubuntu24-geos-env:v8.19.0-intelmpi_2021.13-ifort_2021.13 - # Per https://github.com/actions/virtual-environments/issues/1445#issuecomment-713861495 - # It seems like we might not need secrets on GitHub Actions which is good for forked - # pull requests - #credentials: - #username: ${{ secrets.DOCKERHUB_USERNAME }} - #password: ${{ secrets.DOCKERHUB_TOKEN }} - - env: - OMPI_ALLOW_RUN_AS_ROOT: 1 - OMPI_ALLOW_RUN_AS_ROOT_CONFIRM: 1 - OMPI_MCA_btl_vader_single_copy_mechanism: none - - steps: - # https://github.com/orgs/community/discussions/25678#discussioncomment-5242449 - - name: Delete huge unnecessary tools folder - run: rm -rf /opt/hostedtoolcache - - - name: Checkout GCM - uses: actions/checkout@v5 - with: - fetch-depth: 1 - filter: blob:none - - - name: Set all directories as git safe - run: | - git config --global --add safe.directory '*' - - - name: Versions etc. - run: | - ifort --version - mpirun --version - echo $BASEDIR - - - name: Mepo clone external repos - run: | - mepo clone --partial blobless - mepo status - - - name: Update other branches - if: ${{ github.event.pull_request.head.ref != 'main' && github.event.pull_request.head.ref != 'develop' }} - run: | - mepo checkout-if-exists ${GITHUB_HEAD_REF} - mepo status - - - name: CMake - run: | - cmake -B build -S . --install-prefix=${pwd}/install -DCMAKE_Fortran_COMPILER=ifort -DCMAKE_BUILD_TYPE=Debug -DMPIEXEC_PREFLAGS='--oversubscribe' -DUSE_F2PY=OFF - - - name: Build - run: | - cmake --build build -j 4 - cmake --install build + strategy: + matrix: + compiler: [ifort, gfortran-14, gfortran-15] + build-type: [Debug] + uses: GEOS-ESM/CI-workflows/.github/workflows/geosgcm_build_tests.yml@project/geosgcm + with: + compiler: ${{ matrix.compiler }} + cmake-build-type: ${{ matrix.build-type }} + + spack_build: + uses: GEOS-ESM/CI-workflows/.github/workflows/spack_gcc_build.yml@project/geosgcm + secrets: + BUILDCACHE_USERNAME: ${{ secrets.BUILDCACHE_USERNAME }} + BUILDCACHE_TOKEN: ${{ secrets.BUILDCACHE_TOKEN }} \ No newline at end of file From bc4f83e4cf58b7e046cc30561eaa0aa98e716832 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 9 Oct 2025 14:27:19 -0400 Subject: [PATCH 156/241] v12: Update to ESMA_cmake v4.26.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 621b2e31..1f9676fc 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ | [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/v2.1.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv2.1.0) | -| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.25.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.25.0) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.26.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.26.0) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.15.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.15.0) | | [FMS](https://github.com/GEOS-ESM/FMS) | [geos/2019.01.02+noaff.10](https://github.com/GEOS-ESM/FMS/releases/tag/geos%2F2019.01.02%2Bnoaff.10) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.14.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.14.1) | diff --git a/components.yaml b/components.yaml index 1bc1ee59..c176bf45 100644 --- a/components.yaml +++ b/components.yaml @@ -11,7 +11,7 @@ env: cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v4.25.0 + tag: v4.26.0 develop: develop ecbuild: From aa0028b5b26f13fe45f006f6543aa1e8ced21697 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 14 Oct 2025 10:08:06 -0400 Subject: [PATCH 157/241] Update to MAPL 2.62.1 --- CMakeLists.txt | 2 +- README.md | 2 +- components.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 99f38cf6..102f4468 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -94,7 +94,7 @@ if (NOT Baselibs_FOUND) target_link_libraries(FMS::fms_r8 INTERFACE ${LIBYAML_LIBRARIES}) endif () - find_package(MAPL 2.61 QUIET) + find_package(MAPL 2.62 QUIET) if (MAPL_FOUND) message(STATUS "Found MAPL: ${MAPL_BASE_DIR} (found version \"${MAPL_VERSION})\"") endif () diff --git a/README.md b/README.md index 1f9676fc..7ad7ee1a 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ | [HEMCO](https://github.com/GEOS-ESM/HEMCO) | [geos/v2.3.0](https://github.com/GEOS-ESM/HEMCO/releases/tag/geos%2Fv2.3.0) | | [Icepack](https://github.com/GEOS-ESM/Icepack) | [geos/v0.3.0](https://github.com/GEOS-ESM/Icepack/releases/tag/geos%2Fv0.3.0) | | [MAM](https://github.com/GEOS-ESM/MAM) | [v1.1.0](https://github.com/GEOS-ESM/MAM/releases/tag/v1.1.0) | -| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.61.0](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.61.0) | +| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.62.1](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.62.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) | diff --git a/components.yaml b/components.yaml index c176bf45..4245d581 100644 --- a/components.yaml +++ b/components.yaml @@ -50,7 +50,7 @@ GMAO_perllib: MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - tag: v2.61.0 + tag: v2.62.1 develop: develop GEOSgcm_GridComp: From 3b1a4deffc7f101f860aec7b6c7e295e4a81787f Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 15 Oct 2025 11:44:05 -0400 Subject: [PATCH 158/241] v12: Updates for mixed-precision FMS --- CMakeLists.txt | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 102f4468..c68e8a91 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 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.62 QUIET) From 026a11661b4990664fe0da5acc477cbb8c52d98d Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 15 Oct 2025 11:58:45 -0400 Subject: [PATCH 159/241] Update components --- components.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/components.yaml b/components.yaml index cf3b389d..82f11b45 100644 --- a/components.yaml +++ b/components.yaml @@ -11,7 +11,8 @@ env: cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v4.26.0 + #tag: v4.26.0 + branch: feature/v12-remove-mom5 develop: develop ecbuild: @@ -56,7 +57,8 @@ MAPL: GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - tag: GCMv12-rc20 + #tag: GCMv12-rc20 + branch: feature/v12-remove-mom5 sparse: ./config/GEOSgcm_GridComp.sparse develop: feature/sdrabenh/gcm_v12 From 141d10df5fcde9dba612799f78066d2c18ff6e62 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 17 Oct 2025 11:17:17 -0400 Subject: [PATCH 160/241] v12: Update CI to Baselibs 8.20 --- .circleci/config.yml | 50 ++++++++++++++++------------------ .github/workflows/workflow.yml | 4 +-- 2 files changed, 25 insertions(+), 29 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7fd8f29c..34dabc62 100644 --- a/.circleci/config.yml +++ b/.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.19.0 +baselibs_version: &baselibs_version v8.20.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@dev:2dc9e6eed9d41430a0566539cf81345ab537e201 workflows: build-test: @@ -32,9 +32,7 @@ workflows: - docker-hub-creds matrix: parameters: - # ifx currently can't build FMS - #compiler: [gfortran, ifort, ifx] - compiler: [gfortran, ifort] + compiler: [gfortran, ifort, ifx] baselibs_version: *baselibs_version repo: GEOSgcm persist_workspace: true # Needs to be true to run fv3/gcm experiment, costs extra @@ -46,9 +44,7 @@ workflows: - docker-hub-creds matrix: parameters: - # ifx currently can't build FMS - #compiler: [gfortran, ifort, ifx] - compiler: [gfortran, ifort] + compiler: [gfortran, ifort, ifx] requires: - build-GEOSgcm-on-<< matrix.compiler >> repo: GEOSgcm @@ -99,25 +95,25 @@ workflows: image_name: geos-env-bcs tag_build_arg_name: *tag_build_arg_name resource_class: xlarge - #- ci/publish_docker: - #filters: - #tags: - #only: /^v.*$/ - #name: publish-ifx-docker-image - #context: - #- docker-hub-creds - #- ghcr-creds - #os_version: *os_version - #baselibs_version: *baselibs_version - #bcs_version: *bcs_version - #container_name: geosgcm - #mpi_name: intelmpi - #mpi_version: "2021.14" - #compiler_name: ifx - #compiler_version: "2025.0" - #image_name: geos-env-bcs - #tag_build_arg_name: *tag_build_arg_name - #resource_class: xlarge + - ci/publish_docker: + filters: + tags: + only: /^v.*$/ + name: publish-ifx-docker-image + context: + - docker-hub-creds + - ghcr-creds + os_version: *os_version + baselibs_version: *baselibs_version + bcs_version: *bcs_version + container_name: geosgcm + mpi_name: intelmpi + mpi_version: "2021.16" + compiler_name: ifx + compiler_version: "2025.2" + image_name: geos-env-bcs + tag_build_arg_name: *tag_build_arg_name + resource_class: xlarge - ci/publish_docker: filters: tags: diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 8be10d0c..5085df9d 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -21,7 +21,7 @@ jobs: build_gcm: strategy: matrix: - compiler: [ifort, gfortran-14, gfortran-15] + compiler: [ifort, ifx, gfortran-14, gfortran-15] build-type: [Debug] uses: GEOS-ESM/CI-workflows/.github/workflows/geosgcm_build_tests.yml@project/geosgcm with: @@ -32,4 +32,4 @@ jobs: uses: GEOS-ESM/CI-workflows/.github/workflows/spack_gcc_build.yml@project/geosgcm secrets: BUILDCACHE_USERNAME: ${{ secrets.BUILDCACHE_USERNAME }} - BUILDCACHE_TOKEN: ${{ secrets.BUILDCACHE_TOKEN }} \ No newline at end of file + BUILDCACHE_TOKEN: ${{ secrets.BUILDCACHE_TOKEN }} From fe5df712f6c91e83e429d026bcc6a31e11665e79 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 17 Oct 2025 11:27:43 -0400 Subject: [PATCH 161/241] Turn off ifx for now --- .circleci/config.yml | 46 ++++++++++++++++++---------------- .github/workflows/workflow.yml | 2 +- 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 34dabc62..91b11f50 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -32,7 +32,9 @@ workflows: - docker-hub-creds matrix: parameters: - compiler: [gfortran, ifort, ifx] + # ifx currently can't build FMS + #compiler: [gfortran, ifort, ifx] + compiler: [gfortran, ifort] baselibs_version: *baselibs_version repo: GEOSgcm persist_workspace: true # Needs to be true to run fv3/gcm experiment, costs extra @@ -44,7 +46,9 @@ workflows: - docker-hub-creds matrix: parameters: - compiler: [gfortran, ifort, ifx] + # ifx currently can't build FMS + #compiler: [gfortran, ifort, ifx] + compiler: [gfortran, ifort] requires: - build-GEOSgcm-on-<< matrix.compiler >> repo: GEOSgcm @@ -95,25 +99,25 @@ workflows: image_name: geos-env-bcs tag_build_arg_name: *tag_build_arg_name resource_class: xlarge - - ci/publish_docker: - filters: - tags: - only: /^v.*$/ - name: publish-ifx-docker-image - context: - - docker-hub-creds - - ghcr-creds - os_version: *os_version - baselibs_version: *baselibs_version - bcs_version: *bcs_version - container_name: geosgcm - mpi_name: intelmpi - mpi_version: "2021.16" - compiler_name: ifx - compiler_version: "2025.2" - image_name: geos-env-bcs - tag_build_arg_name: *tag_build_arg_name - resource_class: xlarge + #- ci/publish_docker: + #filters: + #tags: + #only: /^v.*$/ + #name: publish-ifx-docker-image + #context: + #- docker-hub-creds + #- ghcr-creds + #os_version: *os_version + #baselibs_version: *baselibs_version + #bcs_version: *bcs_version + #container_name: geosgcm + #mpi_name: intelmpi + #mpi_version: "2021.16" + #compiler_name: ifx + #compiler_version: "2025.2" + #image_name: geos-env-bcs + #tag_build_arg_name: *tag_build_arg_name + #resource_class: xlarge - ci/publish_docker: filters: tags: diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 5085df9d..9875af29 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -21,7 +21,7 @@ jobs: build_gcm: strategy: matrix: - compiler: [ifort, ifx, gfortran-14, gfortran-15] + compiler: [ifort, gfortran-14, gfortran-15] build-type: [Debug] uses: GEOS-ESM/CI-workflows/.github/workflows/geosgcm_build_tests.yml@project/geosgcm with: From 0d221266997a39b977d1f350b17da22f812f61f2 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 17 Oct 2025 11:55:32 -0400 Subject: [PATCH 162/241] Update to ESMA_cmake v4.28.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7ad7ee1a..824d47e8 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ | [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/v2.1.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv2.1.0) | -| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.26.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.26.0) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.28.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.28.0) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.15.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.15.0) | | [FMS](https://github.com/GEOS-ESM/FMS) | [geos/2019.01.02+noaff.10](https://github.com/GEOS-ESM/FMS/releases/tag/geos%2F2019.01.02%2Bnoaff.10) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.14.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.14.1) | diff --git a/components.yaml b/components.yaml index 4245d581..0a1afe0a 100644 --- a/components.yaml +++ b/components.yaml @@ -11,7 +11,7 @@ env: cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v4.26.0 + tag: v4.28.0 develop: develop ecbuild: From 541adcce9224e9e6f14578c8b94221e51617bbf8 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 17 Oct 2025 12:16:49 -0400 Subject: [PATCH 163/241] Move to stable v5 orb --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 91b11f50..d5f38daa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,7 +21,7 @@ bcs_version: &bcs_version v12.0.0 tag_build_arg_name: &tag_build_arg_name gcmversion orbs: - ci: geos-esm/circleci-tools@dev:2dc9e6eed9d41430a0566539cf81345ab537e201 + ci: geos-esm/circleci-tools@5 workflows: build-test: From 519f3f7a41a51c1945b85882b0cca896485b8340 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 20 Oct 2025 10:22:44 -0400 Subject: [PATCH 164/241] Update ESMA_env --- CMakeLists.txt | 2 +- README.md | 2 +- components.yaml | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c68e8a91..c64beffc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,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) + 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. diff --git a/README.md b/README.md index 8fb0ac0e..c56a494f 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ | [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/v2.1.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv2.1.0) | | [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.28.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.28.0) | -| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.15.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.15.0) | +| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v6.0.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v6.0.0) | | [FMS](https://github.com/GEOS-ESM/FMS) | [geos/2019.01.02+noaff.10](https://github.com/GEOS-ESM/FMS/releases/tag/geos%2F2019.01.02%2Bnoaff.10) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.14.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.14.1) | | [GAAS](https://github.com/GEOS-ESM/GAAS) | [v1.0.0](https://github.com/GEOS-ESM/GAAS/releases/tag/v1.0.0) | diff --git a/components.yaml b/components.yaml index 185285ca..a89eb378 100644 --- a/components.yaml +++ b/components.yaml @@ -5,7 +5,8 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v5.15.0 + #tag: v6.0.0 + branch: feature/baselibs-9.0.0 develop: main cmake: From 8ac5ab35536aa7e3173f2b531018d06b5c6a73a8 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 21 Oct 2025 12:49:24 -0400 Subject: [PATCH 165/241] Update to ESMA_env v6.0.0 --- components.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/components.yaml b/components.yaml index a89eb378..c69358fc 100644 --- a/components.yaml +++ b/components.yaml @@ -5,8 +5,7 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - #tag: v6.0.0 - branch: feature/baselibs-9.0.0 + tag: v6.0.0 develop: main cmake: From 6313c69d81b365e50b407720fcdcbcd9cddf9e14 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 29 Oct 2025 09:34:56 -0400 Subject: [PATCH 166/241] v12: Update to MAPL 2.62.2 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 824d47e8..ba9c7f2c 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ | [HEMCO](https://github.com/GEOS-ESM/HEMCO) | [geos/v2.3.0](https://github.com/GEOS-ESM/HEMCO/releases/tag/geos%2Fv2.3.0) | | [Icepack](https://github.com/GEOS-ESM/Icepack) | [geos/v0.3.0](https://github.com/GEOS-ESM/Icepack/releases/tag/geos%2Fv0.3.0) | | [MAM](https://github.com/GEOS-ESM/MAM) | [v1.1.0](https://github.com/GEOS-ESM/MAM/releases/tag/v1.1.0) | -| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.62.1](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.62.1) | +| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.62.2](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.62.2) | | [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) | diff --git a/components.yaml b/components.yaml index 0a1afe0a..9cf81fa6 100644 --- a/components.yaml +++ b/components.yaml @@ -50,7 +50,7 @@ GMAO_perllib: MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - tag: v2.62.1 + tag: v2.62.2 develop: develop GEOSgcm_GridComp: From c3bec91de307a773e022e145d8c179d5cec58e48 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 31 Oct 2025 11:55:45 -0400 Subject: [PATCH 167/241] v12: Update to ecbuild geos/v3.11.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 824d47e8..31897790 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ | [CARMA](https://github.com/GEOS-ESM/CARMA) | [v1.1.0](https://github.com/GEOS-ESM/CARMA/releases/tag/v1.1.0) | | [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/v2.1.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv2.1.0) | +| [ecbuild](https://github.com/GEOS-ESM/ecbuild) | [geos/v3.11.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv3.11.0) | | [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.28.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.28.0) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.15.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.15.0) | | [FMS](https://github.com/GEOS-ESM/FMS) | [geos/2019.01.02+noaff.10](https://github.com/GEOS-ESM/FMS/releases/tag/geos%2F2019.01.02%2Bnoaff.10) | diff --git a/components.yaml b/components.yaml index 0a1afe0a..71d2a06f 100644 --- a/components.yaml +++ b/components.yaml @@ -17,7 +17,7 @@ cmake: ecbuild: local: ./@cmake/@ecbuild remote: ../ecbuild.git - tag: geos/v2.1.0 + tag: geos/v3.11.0 NCEP_Shared: local: ./src/Shared/@NCEP_Shared From dbe545b4f9a8f7f54503e146e144493b9dd00431 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 3 Nov 2025 12:26:55 -0500 Subject: [PATCH 168/241] Update to ESMA_cmake v5.0.0 --- .circleci/config.yml | 6 +++--- .github/workflows/workflow.yml | 6 +++++- README.md | 2 +- components.yaml | 3 +-- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d5f38daa..2789fea4 100644 --- a/.circleci/config.yml +++ b/.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.20.0 +baselibs_version: &baselibs_version v9.0.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: @@ -133,7 +133,7 @@ workflows: mpi_name: openmpi mpi_version: 5.0.5 compiler_name: gcc - compiler_version: 14.2.0 + compiler_version: 15.2.0 image_name: geos-env-bcs tag_build_arg_name: *tag_build_arg_name resource_class: xlarge diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 9875af29..71b64395 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -21,12 +21,16 @@ jobs: build_gcm: strategy: matrix: - compiler: [ifort, gfortran-14, gfortran-15] + compiler: [ifort, gfortran-15] build-type: [Debug] uses: GEOS-ESM/CI-workflows/.github/workflows/geosgcm_build_tests.yml@project/geosgcm 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 spack_build: uses: GEOS-ESM/CI-workflows/.github/workflows/spack_gcc_build.yml@project/geosgcm diff --git a/README.md b/README.md index c56a494f..616d7999 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ | [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/v2.1.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv2.1.0) | -| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.28.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.28.0) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v5.0.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v5.0.0) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v6.0.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v6.0.0) | | [FMS](https://github.com/GEOS-ESM/FMS) | [geos/2019.01.02+noaff.10](https://github.com/GEOS-ESM/FMS/releases/tag/geos%2F2019.01.02%2Bnoaff.10) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.14.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.14.1) | diff --git a/components.yaml b/components.yaml index c69358fc..7d9be556 100644 --- a/components.yaml +++ b/components.yaml @@ -11,8 +11,7 @@ env: cmake: local: ./@cmake remote: ../ESMA_cmake.git - #tag: v4.28.0 - branch: feature/v12-remove-mom5 + tag: v5.0.0 develop: develop ecbuild: From 3a25546fa8970276037652bd4e803b595929fa6d Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 14 Nov 2025 13:47:36 -0500 Subject: [PATCH 169/241] Update to ESMA_cmake v4.29.0, ESMA_env 5.16.0 --- README.md | 4 ++-- components.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 75d5a4a1..2dd67cf0 100644 --- a/README.md +++ b/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/v2.1.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv2.1.0) | -| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.28.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.28.0) | -| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.15.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.15.0) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.29.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.29.0) | +| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.16.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.16.0) | | [FMS](https://github.com/GEOS-ESM/FMS) | [geos/2019.01.02+noaff.10](https://github.com/GEOS-ESM/FMS/releases/tag/geos%2F2019.01.02%2Bnoaff.10) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.15.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.15.0) | | [GAAS](https://github.com/GEOS-ESM/GAAS) | [v1.0.0](https://github.com/GEOS-ESM/GAAS/releases/tag/v1.0.0) | diff --git a/components.yaml b/components.yaml index 2f4b3c83..06f8037c 100644 --- a/components.yaml +++ b/components.yaml @@ -5,13 +5,13 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v5.15.0 + tag: v5.16.0 develop: main cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v4.28.0 + tag: v4.29.0 develop: develop ecbuild: From e00719932b09ed096edd1a26c23f24274cd57bfe Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 14 Nov 2025 13:48:55 -0500 Subject: [PATCH 170/241] Update to ESMA_cmake v5.1.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7c3a1802..859e8a82 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ | [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/v2.1.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv2.1.0) | -| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v5.0.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v5.0.0) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v5.1.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v5.1.0) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v6.0.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v6.0.0) | | [FMS](https://github.com/GEOS-ESM/FMS) | [geos/2019.01.02+noaff.10](https://github.com/GEOS-ESM/FMS/releases/tag/geos%2F2019.01.02%2Bnoaff.10) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.15.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.15.0) | diff --git a/components.yaml b/components.yaml index c2c73fe5..b693114f 100644 --- a/components.yaml +++ b/components.yaml @@ -11,7 +11,7 @@ env: cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v5.0.0 + tag: v5.1.0 develop: develop ecbuild: From 1facd1e53fbc28efe308e50e34970805a8836240 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 21 Nov 2025 11:04:08 -0500 Subject: [PATCH 171/241] Update to MAPL 2.63.0 --- CMakeLists.txt | 2 +- README.md | 2 +- components.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 102f4468..01fe915f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -94,7 +94,7 @@ if (NOT Baselibs_FOUND) target_link_libraries(FMS::fms_r8 INTERFACE ${LIBYAML_LIBRARIES}) endif () - find_package(MAPL 2.62 QUIET) + find_package(MAPL 2.63 QUIET) if (MAPL_FOUND) message(STATUS "Found MAPL: ${MAPL_BASE_DIR} (found version \"${MAPL_VERSION})\"") endif () diff --git a/README.md b/README.md index 2dd67cf0..c704518d 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ | [HEMCO](https://github.com/GEOS-ESM/HEMCO) | [geos/v2.3.0](https://github.com/GEOS-ESM/HEMCO/releases/tag/geos%2Fv2.3.0) | | [Icepack](https://github.com/GEOS-ESM/Icepack) | [geos/v0.3.0](https://github.com/GEOS-ESM/Icepack/releases/tag/geos%2Fv0.3.0) | | [MAM](https://github.com/GEOS-ESM/MAM) | [v1.1.0](https://github.com/GEOS-ESM/MAM/releases/tag/v1.1.0) | -| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.62.2](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.62.2) | +| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.63.0](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.63.0) | | [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) | diff --git a/components.yaml b/components.yaml index 06f8037c..68a23e39 100644 --- a/components.yaml +++ b/components.yaml @@ -50,7 +50,7 @@ GMAO_perllib: MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - tag: v2.62.2 + tag: v2.63.0 develop: develop GEOSgcm_GridComp: From b50dead928daf241441ad409e7d2a73203e2c61c Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 5 Dec 2025 11:32:00 -0500 Subject: [PATCH 172/241] v12: Update to MAPL 2.64.0 --- CMakeLists.txt | 2 +- README.md | 2 +- components.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 01fe915f..4b306ebd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -94,7 +94,7 @@ if (NOT Baselibs_FOUND) target_link_libraries(FMS::fms_r8 INTERFACE ${LIBYAML_LIBRARIES}) endif () - find_package(MAPL 2.63 QUIET) + find_package(MAPL 2.64 QUIET) if (MAPL_FOUND) message(STATUS "Found MAPL: ${MAPL_BASE_DIR} (found version \"${MAPL_VERSION})\"") endif () diff --git a/README.md b/README.md index 0c9141b2..fbf2acf0 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ | [HEMCO](https://github.com/GEOS-ESM/HEMCO) | [geos/v2.3.0](https://github.com/GEOS-ESM/HEMCO/releases/tag/geos%2Fv2.3.0) | | [Icepack](https://github.com/GEOS-ESM/Icepack) | [geos/v0.3.0](https://github.com/GEOS-ESM/Icepack/releases/tag/geos%2Fv0.3.0) | | [MAM](https://github.com/GEOS-ESM/MAM) | [v1.1.0](https://github.com/GEOS-ESM/MAM/releases/tag/v1.1.0) | -| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.63.0](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.63.0) | +| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.64.0](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.64.0) | | [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) | diff --git a/components.yaml b/components.yaml index a2482adc..476743bb 100644 --- a/components.yaml +++ b/components.yaml @@ -50,7 +50,7 @@ GMAO_perllib: MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - tag: v2.63.0 + tag: v2.64.0 develop: develop GEOSgcm_GridComp: From d17e9b0d495ce3778b1c59265f007f567f6e51fe Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst Date: Fri, 12 Dec 2025 10:21:32 -0500 Subject: [PATCH 173/241] uptick to prerelease GCMv12-rc21 --- components.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/components.yaml b/components.yaml index 476743bb..0937a974 100644 --- a/components.yaml +++ b/components.yaml @@ -29,14 +29,14 @@ NCEP_Shared: GMAO_Shared: local: ./src/Shared/@GMAO_Shared remote: ../GMAO_Shared.git - tag: GCMv12-rc20 + tag: GCMv12-rc21 sparse: ./config/GMAO_Shared.sparse develop: feature/sdrabenh/gcm_v12 GEOS_Util: local: ./src/Shared/@GMAO_Shared/@GEOS_Util remote: ../GEOS_Util.git - tag: GCMv12-rc20 + tag: GCMv12-rc21 develop: feature/sdrabenh/gcm_v12 GMAO_perllib: @@ -56,7 +56,7 @@ MAPL: GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - tag: GCMv12-rc20 + tag: GCMv12-rc21 sparse: ./config/GEOSgcm_GridComp.sparse develop: feature/sdrabenh/gcm_v12 @@ -75,13 +75,13 @@ GigaTraj: FVdycoreCubed_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp remote: ../FVdycoreCubed_GridComp.git - tag: GCMv12-rc20 + tag: GCMv12-rc21 develop: feature/sdrabenh/gcm_v12 fvdycore: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp/@fvdycore remote: ../GFDL_atmos_cubed_sphere.git - tag: GCMv12-rc20 + tag: GCMv12-rc21 develop: feature/sdrabenh/gcm_v12 GEOSchem_GridComp: @@ -239,7 +239,7 @@ umwm: GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git - tag: GCMv12-rc20 + tag: GCMv12-rc21 develop: feature/sdrabenh/gcm_v12 UMD_Etc: From f653123d1a449e8d76b12e74653b623419faad23 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 12 Dec 2025 15:10:31 -0500 Subject: [PATCH 174/241] v12: Add GenCast_GEOS-FP --- components.yaml | 8 ++++++++ src/CMakeLists.txt | 7 ++++--- src/FoundationModels/.gitignore | 3 +++ 3 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 src/FoundationModels/.gitignore diff --git a/components.yaml b/components.yaml index 0937a974..4ba439a0 100644 --- a/components.yaml +++ b/components.yaml @@ -260,3 +260,11 @@ Topo: tag: geos/v2.1.0 develop: geos blobless: true + +GenCast_GEOS-FP: + local: ./src/FoundationModels/@GenCast_GEOS-FP + remote: ../GenCast_GEOS-FP.git + tag: 0.3.0 + # Note: There is a dev branch but it seems out of date compared to main + develop: main + diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 73349420..acc3cf93 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,3 +1,4 @@ -add_subdirectory (Shared) -add_subdirectory (Components) -add_subdirectory (Applications) +add_subdirectory(Shared) +add_subdirectory(Components) +add_subdirectory(Applications) +add_subdirectory(FoundationModels) diff --git a/src/FoundationModels/.gitignore b/src/FoundationModels/.gitignore new file mode 100644 index 00000000..9f839a71 --- /dev/null +++ b/src/FoundationModels/.gitignore @@ -0,0 +1,3 @@ +/@GenCast_GEOS-FP +/GenCast_GEOS-FP +/GenCast_GEOS-FP@ From 8939784da3d82c7f69a4cc90ea75656015e4498c Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 12 Dec 2025 15:22:50 -0500 Subject: [PATCH 175/241] Add stub for GenCast_GEOS-FP CMake --- src/FoundationModels/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/FoundationModels/CMakeLists.txt diff --git a/src/FoundationModels/CMakeLists.txt b/src/FoundationModels/CMakeLists.txt new file mode 100644 index 00000000..42c1d551 --- /dev/null +++ b/src/FoundationModels/CMakeLists.txt @@ -0,0 +1 @@ +#esma_add_subdirectory(GenCast_GEOS-FP) From 90840531a7eb95cec75e9fe2a4f05e7b98d1ae6c Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 2 Jan 2026 12:59:54 -0500 Subject: [PATCH 176/241] v12: Updates for Turin support at NAS --- components.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components.yaml b/components.yaml index 0937a974..5c604458 100644 --- a/components.yaml +++ b/components.yaml @@ -5,13 +5,13 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v5.16.0 + tag: v5.17.0 develop: main cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v4.29.0 + tag: v4.30.0 develop: develop ecbuild: From bff48adf8fed4b76c79c786cfbabca1f42546adb Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 2 Jan 2026 13:00:23 -0500 Subject: [PATCH 177/241] Updates for Turin support at NAS --- components.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components.yaml b/components.yaml index a5af0cf2..3423b881 100644 --- a/components.yaml +++ b/components.yaml @@ -5,13 +5,13 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v6.0.0 + tag: v6.1.0 develop: main cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v5.1.0 + tag: v5.2.0 develop: develop ecbuild: From 3ad1f4e7eb3091557a753f5d3fcec7cb263045b9 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 2 Jan 2026 13:05:25 -0500 Subject: [PATCH 178/241] Update readme --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index fbf2acf0..502f42ba 100644 --- a/README.md +++ b/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.11.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv3.11.0) | -| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.29.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.29.0) | -| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.16.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.16.0) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.30.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.30.0) | +| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.17.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.17.0) | | [FMS](https://github.com/GEOS-ESM/FMS) | [geos/2019.01.02+noaff.10](https://github.com/GEOS-ESM/FMS/releases/tag/geos%2F2019.01.02%2Bnoaff.10) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.15.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.15.0) | | [GAAS](https://github.com/GEOS-ESM/GAAS) | [v1.0.0](https://github.com/GEOS-ESM/GAAS/releases/tag/v1.0.0) | @@ -33,7 +33,7 @@ | [gigatraj](https://github.com/GEOS-ESM/gigatraj) | [geos/v1.0.0](https://github.com/GEOS-ESM/gigatraj/releases/tag/geos%2Fv1.0.0) | | [GMI](https://github.com/GEOS-ESM/GMI) | [v1.3.0](https://github.com/GEOS-ESM/GMI/releases/tag/v1.3.0) | | [GMAO_perllib](https://github.com/GEOS-ESM/GMAO_perllib) | [v1.1.0](https://github.com/GEOS-ESM/GMAO_perllib/releases/tag/v1.1.0) | -| [GMAO_Shared](https://github.com/GEOS-ESM/GMAO_Shared) | [v2.1.4](https://github.com/GEOS-ESM/GMAO_Shared/releases/tag/v2.1.4) | +| [GMAO_Shared](https://github.com/GEOS-ESM/GMAO_Shared) | [v2.1.5](https://github.com/GEOS-ESM/GMAO_Shared/releases/tag/v2.1.5) | | [GOCART](https://github.com/GEOS-ESM/GOCART) | [v2.3.0](https://github.com/GEOS-ESM/GOCART/releases/tag/v2.3.0) | | [HEMCO](https://github.com/GEOS-ESM/HEMCO) | [geos/v2.3.0](https://github.com/GEOS-ESM/HEMCO/releases/tag/geos%2Fv2.3.0) | | [Icepack](https://github.com/GEOS-ESM/Icepack) | [geos/v0.3.0](https://github.com/GEOS-ESM/Icepack/releases/tag/geos%2Fv0.3.0) | From 0e3b24285cb76b55fa6a51b24eb37140a67cbd53 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 2 Jan 2026 13:05:59 -0500 Subject: [PATCH 179/241] Update readme --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index d4ea64fe..8efeb050 100644 --- a/README.md +++ b/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.11.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv3.11.0) | -| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v5.1.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v5.1.0) | -| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v6.0.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v6.0.0) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v5.2.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v5.2.0) | +| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v6.1.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v6.1.0) | | [FMS](https://github.com/GEOS-ESM/FMS) | [geos/2019.01.02+noaff.10](https://github.com/GEOS-ESM/FMS/releases/tag/geos%2F2019.01.02%2Bnoaff.10) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.15.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.15.0) | | [GAAS](https://github.com/GEOS-ESM/GAAS) | [v1.0.0](https://github.com/GEOS-ESM/GAAS/releases/tag/v1.0.0) | @@ -33,7 +33,7 @@ | [gigatraj](https://github.com/GEOS-ESM/gigatraj) | [geos/v1.0.0](https://github.com/GEOS-ESM/gigatraj/releases/tag/geos%2Fv1.0.0) | | [GMI](https://github.com/GEOS-ESM/GMI) | [v1.3.0](https://github.com/GEOS-ESM/GMI/releases/tag/v1.3.0) | | [GMAO_perllib](https://github.com/GEOS-ESM/GMAO_perllib) | [v1.1.0](https://github.com/GEOS-ESM/GMAO_perllib/releases/tag/v1.1.0) | -| [GMAO_Shared](https://github.com/GEOS-ESM/GMAO_Shared) | [v2.1.4](https://github.com/GEOS-ESM/GMAO_Shared/releases/tag/v2.1.4) | +| [GMAO_Shared](https://github.com/GEOS-ESM/GMAO_Shared) | [v2.1.5](https://github.com/GEOS-ESM/GMAO_Shared/releases/tag/v2.1.5) | | [GOCART](https://github.com/GEOS-ESM/GOCART) | [v2.3.0](https://github.com/GEOS-ESM/GOCART/releases/tag/v2.3.0) | | [HEMCO](https://github.com/GEOS-ESM/HEMCO) | [geos/v2.3.0](https://github.com/GEOS-ESM/HEMCO/releases/tag/geos%2Fv2.3.0) | | [Icepack](https://github.com/GEOS-ESM/Icepack) | [geos/v0.3.0](https://github.com/GEOS-ESM/Icepack/releases/tag/geos%2Fv0.3.0) | From d6a0687d5488089b1d99f5385598573050787fc1 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 6 Jan 2026 11:16:24 -0500 Subject: [PATCH 180/241] v12: Update to MAPL 2.64.1 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 502f42ba..77a6c6f3 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ | [HEMCO](https://github.com/GEOS-ESM/HEMCO) | [geos/v2.3.0](https://github.com/GEOS-ESM/HEMCO/releases/tag/geos%2Fv2.3.0) | | [Icepack](https://github.com/GEOS-ESM/Icepack) | [geos/v0.3.0](https://github.com/GEOS-ESM/Icepack/releases/tag/geos%2Fv0.3.0) | | [MAM](https://github.com/GEOS-ESM/MAM) | [v1.1.0](https://github.com/GEOS-ESM/MAM/releases/tag/v1.1.0) | -| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.64.0](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.64.0) | +| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.64.1](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.64.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) | diff --git a/components.yaml b/components.yaml index 5c604458..f4c1f2c0 100644 --- a/components.yaml +++ b/components.yaml @@ -50,7 +50,7 @@ GMAO_perllib: MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - tag: v2.64.0 + tag: v2.64.1 develop: develop GEOSgcm_GridComp: From 9c6d93ab1d937bd459d12da3fc577bbf066642bf Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 6 Jan 2026 13:02:46 -0500 Subject: [PATCH 181/241] Install GenCast --- src/FoundationModels/CMakeLists.txt | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/FoundationModels/CMakeLists.txt b/src/FoundationModels/CMakeLists.txt index 42c1d551..442420f6 100644 --- a/src/FoundationModels/CMakeLists.txt +++ b/src/FoundationModels/CMakeLists.txt @@ -1 +1,18 @@ #esma_add_subdirectory(GenCast_GEOS-FP) + +# At the moment, GenCast_GEOS-FP is not compatible with the CMake build system +# as we don't really build anything in it. Instead, we will just "install" the +# directory to the install tree. So we'd get $CMAKE_INSTALL_PREFIX/GenCast_GEOS-FP +# after installation. + +# One complication, though, is that mepo can call it GenCast_GEOS-FP or +# @GenCast_GEOS-FP or GenCast_GEOS-FP@ depending on the user's mepo settings. +# We have a function for this, esma_mepo_style(), that we can use to get the +# correct name. + +esma_mepo_style(GenCast_GEOS-FP mepo_GenCast_GEOS_FP) + +install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${mepo_GenCast_GEOS_FP} + DESTINATION GenCast_GEOS-FP + USE_SOURCE_PERMISSIONS + ) From 8ae7edb2b1db44a0bf67e6be9ad7cfe8a5919e35 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 6 Jan 2026 13:36:36 -0500 Subject: [PATCH 182/241] Need a slash --- src/FoundationModels/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FoundationModels/CMakeLists.txt b/src/FoundationModels/CMakeLists.txt index 442420f6..cab9273b 100644 --- a/src/FoundationModels/CMakeLists.txt +++ b/src/FoundationModels/CMakeLists.txt @@ -12,7 +12,7 @@ esma_mepo_style(GenCast_GEOS-FP mepo_GenCast_GEOS_FP) -install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${mepo_GenCast_GEOS_FP} +install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${mepo_GenCast_GEOS_FP}/ DESTINATION GenCast_GEOS-FP USE_SOURCE_PERMISSIONS ) From 1981da6e6b0b2e0127e4168a379f9114a97c9bd8 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 7 Jan 2026 11:20:08 -0500 Subject: [PATCH 183/241] Update components --- README.md | 1 + components.yaml | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 77a6c6f3..daae2fd0 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,7 @@ | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.15.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.15.0) | | [GAAS](https://github.com/GEOS-ESM/GAAS) | [v1.0.0](https://github.com/GEOS-ESM/GAAS/releases/tag/v1.0.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) | +| [GenCast-GEOS_FP](https://github.com/GEOS-ESM/GenCast_GEOS-FP) | [geos/v0.3.1](https://github.com/GEOS-ESM/GenCast_GEOS-FP/releases/tag/geos%2Fv0.3.1) | | [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v3.7.0](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v3.7.0) | | [GEOS_Util](https://github.com/GEOS-ESM/GEOS_Util) | [v2.1.11](https://github.com/GEOS-ESM/GEOS_Util/releases/tag/v2.1.11) | | [geos_state_bias](https://github.com/GEOS-ESM/geos_state_bias) | [geos/v1.0.0](https://github.com/GEOS-ESM/geos_state_bias/releases/tag/geos/v1.0.0) | diff --git a/components.yaml b/components.yaml index cd938012..33f5bd0e 100644 --- a/components.yaml +++ b/components.yaml @@ -264,7 +264,6 @@ Topo: GenCast_GEOS-FP: local: ./src/FoundationModels/@GenCast_GEOS-FP remote: ../GenCast_GEOS-FP.git - tag: 0.3.0 - # Note: There is a dev branch but it seems out of date compared to main - develop: main + tag: geos/v0.3.1 + develop: geos/main From 12a299dea310d8d5632a7db9ac7c62e82f8e85c1 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 13 Jan 2026 09:57:53 -0500 Subject: [PATCH 184/241] Fixes for CI? --- .circleci/config.yml | 2 +- .github/workflows/workflow.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2789fea4..b060ecd4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,7 +16,7 @@ parameters: # Anchors to prevent forgetting to update a version os_version: &os_version ubuntu24 -baselibs_version: &baselibs_version v9.0.0 +baselibs_version: &baselibs_version v9.4.0 bcs_version: &bcs_version v12.0.0 tag_build_arg_name: &tag_build_arg_name gcmversion diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 3059230f..3d016c4a 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -31,6 +31,7 @@ jobs: # 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.4.0 spack_build: uses: GEOS-ESM/CI-workflows/.github/workflows/spack_gcc_build.yml@project/geosgcm From 3d89e1bb852898a3142e543631339cf95b0211ed Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 14 Jan 2026 12:31:35 -0500 Subject: [PATCH 185/241] Update circleci --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d5f38daa..ae2c1275 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,7 +16,7 @@ parameters: # Anchors to prevent forgetting to update a version os_version: &os_version ubuntu24 -baselibs_version: &baselibs_version v8.20.0 +baselibs_version: &baselibs_version v8.24.0 bcs_version: &bcs_version v12.0.0 tag_build_arg_name: &tag_build_arg_name gcmversion From 3629b8c0f33df490a98442b537079d007d35d234 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 14 Jan 2026 12:41:07 -0500 Subject: [PATCH 186/241] v12: Enable ifx in CI --- .circleci/config.yml | 50 +++++++++++++++------------------- .github/workflows/workflow.yml | 2 +- 2 files changed, 23 insertions(+), 29 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ae2c1275..12e40253 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -32,9 +32,7 @@ workflows: - docker-hub-creds matrix: parameters: - # ifx currently can't build FMS - #compiler: [gfortran, ifort, ifx] - compiler: [gfortran, ifort] + compiler: [gfortran, ifort, ifx] baselibs_version: *baselibs_version repo: GEOSgcm persist_workspace: true # Needs to be true to run fv3/gcm experiment, costs extra @@ -46,9 +44,7 @@ workflows: - docker-hub-creds matrix: parameters: - # ifx currently can't build FMS - #compiler: [gfortran, ifort, ifx] - compiler: [gfortran, ifort] + compiler: [gfortran, ifort, ifx] requires: - build-GEOSgcm-on-<< matrix.compiler >> repo: GEOSgcm @@ -65,9 +61,7 @@ workflows: - docker-hub-creds matrix: parameters: - # ifx currently can't build FMS - #compiler: [ifort, ifx] - compiler: [ifort] + compiler: [ifort, ifx] requires: - build-GEOSgcm-on-<< matrix.compiler >> repo: GEOSgcm @@ -99,25 +93,25 @@ workflows: image_name: geos-env-bcs tag_build_arg_name: *tag_build_arg_name resource_class: xlarge - #- ci/publish_docker: - #filters: - #tags: - #only: /^v.*$/ - #name: publish-ifx-docker-image - #context: - #- docker-hub-creds - #- ghcr-creds - #os_version: *os_version - #baselibs_version: *baselibs_version - #bcs_version: *bcs_version - #container_name: geosgcm - #mpi_name: intelmpi - #mpi_version: "2021.16" - #compiler_name: ifx - #compiler_version: "2025.2" - #image_name: geos-env-bcs - #tag_build_arg_name: *tag_build_arg_name - #resource_class: xlarge + - ci/publish_docker: + filters: + tags: + only: /^v.*$/ + name: publish-ifx-docker-image + context: + - docker-hub-creds + - ghcr-creds + os_version: *os_version + baselibs_version: *baselibs_version + bcs_version: *bcs_version + container_name: geosgcm + mpi_name: intelmpi + mpi_version: "2021.17" + compiler_name: ifx + compiler_version: "2025.3" + image_name: geos-env-bcs + tag_build_arg_name: *tag_build_arg_name + resource_class: xlarge - ci/publish_docker: filters: tags: diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 81e1e674..8222bd28 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -21,7 +21,7 @@ jobs: build_gcm: strategy: matrix: - compiler: [ifort, gfortran-14, gfortran-15] + compiler: [ifort, gfortran-14, gfortran-15, ifx] build-type: [Debug] uses: GEOS-ESM/CI-workflows/.github/workflows/geosgcm_build_tests.yml@project/geosgcm with: From d5ba5765464c613d29fe7129fd55d09f249bb3f9 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 14 Jan 2026 13:23:31 -0500 Subject: [PATCH 187/241] Add fail-fast false --- .github/workflows/workflow.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 8222bd28..84c36827 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -27,6 +27,7 @@ jobs: with: compiler: ${{ matrix.compiler }} cmake-build-type: ${{ matrix.build-type }} + fail-fast: false spack_build: uses: GEOS-ESM/CI-workflows/.github/workflows/spack_gcc_build.yml@project/geosgcm From 777532a40c3967ae54c1ae9bfa76fc21813389ca Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 14 Jan 2026 14:36:31 -0500 Subject: [PATCH 188/241] Turn off ifx mom6 run --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 12e40253..39829698 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -61,7 +61,8 @@ workflows: - docker-hub-creds matrix: parameters: - compiler: [ifort, ifx] + #compiler: [ifort, ifx] + compiler: [ifx] requires: - build-GEOSgcm-on-<< matrix.compiler >> repo: GEOSgcm From 4aef70e7026b5e24bb32b68e99806e40f33068c7 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 14 Jan 2026 15:05:19 -0500 Subject: [PATCH 189/241] Actually turn off ifx --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 39829698..f0d14bea 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -62,7 +62,7 @@ workflows: matrix: parameters: #compiler: [ifort, ifx] - compiler: [ifx] + compiler: [ifort] requires: - build-GEOSgcm-on-<< matrix.compiler >> repo: GEOSgcm From e2e98f2fd8027605c7501475f1bf0f9e9892448e Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 15 Jan 2026 15:01:22 -0500 Subject: [PATCH 190/241] Update to Ocean GC v3.7.1 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index daae2fd0..7d50d0f5 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ | [GAAS](https://github.com/GEOS-ESM/GAAS) | [v1.0.0](https://github.com/GEOS-ESM/GAAS/releases/tag/v1.0.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) | | [GenCast-GEOS_FP](https://github.com/GEOS-ESM/GenCast_GEOS-FP) | [geos/v0.3.1](https://github.com/GEOS-ESM/GenCast_GEOS-FP/releases/tag/geos%2Fv0.3.1) | -| [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v3.7.0](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v3.7.0) | +| [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v3.7.1](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v3.7.1) | | [GEOS_Util](https://github.com/GEOS-ESM/GEOS_Util) | [v2.1.11](https://github.com/GEOS-ESM/GEOS_Util/releases/tag/v2.1.11) | | [geos_state_bias](https://github.com/GEOS-ESM/geos_state_bias) | [geos/v1.0.0](https://github.com/GEOS-ESM/geos_state_bias/releases/tag/geos/v1.0.0) | | [GEOSchem_GridComp](https://github.com/GEOS-ESM/GEOSchem_GridComp) | [v1.16.0](https://github.com/GEOS-ESM/GEOSchem_GridComp/releases/tag/v1.16.0) | diff --git a/components.yaml b/components.yaml index 33f5bd0e..8818c7a7 100644 --- a/components.yaml +++ b/components.yaml @@ -171,7 +171,7 @@ ACHEM: GEOS_OceanGridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp remote: ../GEOS_OceanGridComp.git - tag: v3.7.0 + tag: v3.7.1 develop: develop mom: From dced96b40467f194f1504a94573a2b7799e2582f Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst Date: Fri, 16 Jan 2026 12:44:23 -0500 Subject: [PATCH 191/241] Uptick to GCMv12-rc22 --- components.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/components.yaml b/components.yaml index 8818c7a7..06572048 100644 --- a/components.yaml +++ b/components.yaml @@ -29,14 +29,14 @@ NCEP_Shared: GMAO_Shared: local: ./src/Shared/@GMAO_Shared remote: ../GMAO_Shared.git - tag: GCMv12-rc21 + tag: GCMv12-rc22 sparse: ./config/GMAO_Shared.sparse develop: feature/sdrabenh/gcm_v12 GEOS_Util: local: ./src/Shared/@GMAO_Shared/@GEOS_Util remote: ../GEOS_Util.git - tag: GCMv12-rc21 + tag: GCMv12-rc22 develop: feature/sdrabenh/gcm_v12 GMAO_perllib: @@ -56,7 +56,7 @@ MAPL: GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - tag: GCMv12-rc21 + tag: GCMv12-rc22 sparse: ./config/GEOSgcm_GridComp.sparse develop: feature/sdrabenh/gcm_v12 @@ -87,7 +87,7 @@ fvdycore: GEOSchem_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp remote: ../GEOSchem_GridComp.git - tag: GCMv12-rc13 + tag: GCMv12-rc22 develop: feature/sdrabenh/gcm_v12 HEMCO: @@ -105,7 +105,7 @@ geos-chem: GOCART: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@GOCART remote: ../GOCART.git - tag: GCMv12-rc20 + tag: GCMv12-rc22 develop: feature/sdrabenh/gcm_v12 QuickChem: @@ -239,7 +239,7 @@ umwm: GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git - tag: GCMv12-rc21 + tag: GCMv12-rc22 develop: feature/sdrabenh/gcm_v12 UMD_Etc: From 18c549f7606b904d7b3f66b77f4c71d8c48e1499 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 16 Jan 2026 15:14:59 -0500 Subject: [PATCH 192/241] v12: Update to MAPL 2.64.2 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7d50d0f5..43ac5dd1 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ | [HEMCO](https://github.com/GEOS-ESM/HEMCO) | [geos/v2.3.0](https://github.com/GEOS-ESM/HEMCO/releases/tag/geos%2Fv2.3.0) | | [Icepack](https://github.com/GEOS-ESM/Icepack) | [geos/v0.3.0](https://github.com/GEOS-ESM/Icepack/releases/tag/geos%2Fv0.3.0) | | [MAM](https://github.com/GEOS-ESM/MAM) | [v1.1.0](https://github.com/GEOS-ESM/MAM/releases/tag/v1.1.0) | -| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.64.1](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.64.1) | +| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.64.2](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.64.2) | | [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) | diff --git a/components.yaml b/components.yaml index 06572048..246cb404 100644 --- a/components.yaml +++ b/components.yaml @@ -50,7 +50,7 @@ GMAO_perllib: MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - tag: v2.64.1 + tag: v2.64.2 develop: develop GEOSgcm_GridComp: From 8221633efa62f153a4007ea77e754f8711b5d469 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 29 Jan 2026 14:51:28 -0500 Subject: [PATCH 193/241] v12: Update to MAPL 2.65.0 --- CMakeLists.txt | 2 +- README.md | 2 +- components.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4b306ebd..450f7039 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -94,7 +94,7 @@ if (NOT Baselibs_FOUND) target_link_libraries(FMS::fms_r8 INTERFACE ${LIBYAML_LIBRARIES}) endif () - find_package(MAPL 2.64 QUIET) + find_package(MAPL 2.65 QUIET) if (MAPL_FOUND) message(STATUS "Found MAPL: ${MAPL_BASE_DIR} (found version \"${MAPL_VERSION})\"") endif () diff --git a/README.md b/README.md index 43ac5dd1..56c5020c 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ | [HEMCO](https://github.com/GEOS-ESM/HEMCO) | [geos/v2.3.0](https://github.com/GEOS-ESM/HEMCO/releases/tag/geos%2Fv2.3.0) | | [Icepack](https://github.com/GEOS-ESM/Icepack) | [geos/v0.3.0](https://github.com/GEOS-ESM/Icepack/releases/tag/geos%2Fv0.3.0) | | [MAM](https://github.com/GEOS-ESM/MAM) | [v1.1.0](https://github.com/GEOS-ESM/MAM/releases/tag/v1.1.0) | -| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.64.2](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.64.2) | +| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.65.0](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.65.0) | | [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) | diff --git a/components.yaml b/components.yaml index 246cb404..b961fddb 100644 --- a/components.yaml +++ b/components.yaml @@ -50,7 +50,7 @@ GMAO_perllib: MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - tag: v2.64.2 + tag: v2.65.0 develop: develop GEOSgcm_GridComp: From fc414a94c492d42f254087fd07862c29c3a7efb1 Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst Date: Fri, 30 Jan 2026 09:46:01 -0500 Subject: [PATCH 194/241] Uptick to GCMv12-rc23 --- components.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components.yaml b/components.yaml index 246cb404..d7fc5fb2 100644 --- a/components.yaml +++ b/components.yaml @@ -56,7 +56,7 @@ MAPL: GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - tag: GCMv12-rc22 + tag: GCMv12-rc23 sparse: ./config/GEOSgcm_GridComp.sparse develop: feature/sdrabenh/gcm_v12 @@ -105,7 +105,7 @@ geos-chem: GOCART: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@GOCART remote: ../GOCART.git - tag: GCMv12-rc22 + tag: GCMv12-rc23 develop: feature/sdrabenh/gcm_v12 QuickChem: @@ -239,7 +239,7 @@ umwm: GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git - tag: GCMv12-rc22 + tag: GCMv12-rc23 develop: feature/sdrabenh/gcm_v12 UMD_Etc: From eca1808214d8fd24062c48a51a343d5aa7c0590c Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 30 Jan 2026 13:50:52 -0500 Subject: [PATCH 195/241] Update to ESMA_cmake v5.3.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9cd75924..cd39dc67 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ | [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.11.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv3.11.0) | -| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v5.2.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v5.2.0) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v5.3.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v5.3.0) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v6.1.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v6.1.0) | | [FMS](https://github.com/GEOS-ESM/FMS) | [geos/2019.01.02+noaff.10](https://github.com/GEOS-ESM/FMS/releases/tag/geos%2F2019.01.02%2Bnoaff.10) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.15.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.15.0) | diff --git a/components.yaml b/components.yaml index 225d9cd7..6b808990 100644 --- a/components.yaml +++ b/components.yaml @@ -11,7 +11,7 @@ env: cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v5.2.0 + tag: v5.3.0 develop: develop ecbuild: From 930cd32640d39a2569dc63fdce517a64c6fafd92 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 30 Jan 2026 13:52:28 -0500 Subject: [PATCH 196/241] v12: Update to ESMA_cmake v4.31.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 43ac5dd1..19f9e4c7 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ | [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.11.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv3.11.0) | -| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.30.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.30.0) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.31.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.31.0) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.17.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.17.0) | | [FMS](https://github.com/GEOS-ESM/FMS) | [geos/2019.01.02+noaff.10](https://github.com/GEOS-ESM/FMS/releases/tag/geos%2F2019.01.02%2Bnoaff.10) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.15.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.15.0) | diff --git a/components.yaml b/components.yaml index d7fc5fb2..b0f6d09c 100644 --- a/components.yaml +++ b/components.yaml @@ -11,7 +11,7 @@ env: cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v4.30.0 + tag: v4.31.0 develop: develop ecbuild: From 1b5ba8aa78e173b214b3f5b31f72a68d5813bb69 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 9 Feb 2026 14:30:47 -0500 Subject: [PATCH 197/241] v12: Update ESMA_cmake to v4.32.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 19f9e4c7..329bd2cb 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ | [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.11.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv3.11.0) | -| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.31.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.31.0) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.32.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.32.0) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.17.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.17.0) | | [FMS](https://github.com/GEOS-ESM/FMS) | [geos/2019.01.02+noaff.10](https://github.com/GEOS-ESM/FMS/releases/tag/geos%2F2019.01.02%2Bnoaff.10) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.15.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.15.0) | diff --git a/components.yaml b/components.yaml index b0f6d09c..447dadbe 100644 --- a/components.yaml +++ b/components.yaml @@ -11,7 +11,7 @@ env: cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v4.31.0 + tag: v4.32.0 develop: develop ecbuild: From c466f7db4534f88a2c8da2afdb17a1c36323c91b Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 9 Feb 2026 14:31:32 -0500 Subject: [PATCH 198/241] Update to ESMA_cmake v5.4.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index cd39dc67..c05b60c8 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ | [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.11.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv3.11.0) | -| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v5.3.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v5.3.0) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v5.4.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v5.4.0) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v6.1.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v6.1.0) | | [FMS](https://github.com/GEOS-ESM/FMS) | [geos/2019.01.02+noaff.10](https://github.com/GEOS-ESM/FMS/releases/tag/geos%2F2019.01.02%2Bnoaff.10) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.15.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.15.0) | diff --git a/components.yaml b/components.yaml index 6b808990..4b2061db 100644 --- a/components.yaml +++ b/components.yaml @@ -11,7 +11,7 @@ env: cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v5.3.0 + tag: v5.4.0 develop: develop ecbuild: From 716a3d077a6b83b3890e2f14b61c8e829753ea0d Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 10 Feb 2026 12:08:45 -0500 Subject: [PATCH 199/241] Update to ESMA_cmake v4.33.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 329bd2cb..fb420a01 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ | [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.11.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv3.11.0) | -| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.32.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.32.0) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.33.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.33.0) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.17.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.17.0) | | [FMS](https://github.com/GEOS-ESM/FMS) | [geos/2019.01.02+noaff.10](https://github.com/GEOS-ESM/FMS/releases/tag/geos%2F2019.01.02%2Bnoaff.10) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.15.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.15.0) | diff --git a/components.yaml b/components.yaml index 447dadbe..2172e99f 100644 --- a/components.yaml +++ b/components.yaml @@ -11,7 +11,7 @@ env: cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v4.32.0 + tag: v4.33.0 develop: develop ecbuild: From 8e35c7f26c59a4037f3f6ad06527f9d7052c4d14 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 10 Feb 2026 12:09:09 -0500 Subject: [PATCH 200/241] Update to ESMA_cmake v5.5.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c05b60c8..4edeaa5c 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ | [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.11.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv3.11.0) | -| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v5.4.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v5.4.0) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v5.5.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v5.5.0) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v6.1.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v6.1.0) | | [FMS](https://github.com/GEOS-ESM/FMS) | [geos/2019.01.02+noaff.10](https://github.com/GEOS-ESM/FMS/releases/tag/geos%2F2019.01.02%2Bnoaff.10) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.15.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.15.0) | diff --git a/components.yaml b/components.yaml index 4b2061db..2462add9 100644 --- a/components.yaml +++ b/components.yaml @@ -11,7 +11,7 @@ env: cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v5.4.0 + tag: v5.5.0 develop: develop ecbuild: From a80cc9f877c2596791ad2d529b8dc832b6baea73 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 12 Feb 2026 10:31:38 -0500 Subject: [PATCH 201/241] v12: Update to GEOS_OceanGridComp v3.8.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 56c5020c..9986b2b6 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ | [GAAS](https://github.com/GEOS-ESM/GAAS) | [v1.0.0](https://github.com/GEOS-ESM/GAAS/releases/tag/v1.0.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) | | [GenCast-GEOS_FP](https://github.com/GEOS-ESM/GenCast_GEOS-FP) | [geos/v0.3.1](https://github.com/GEOS-ESM/GenCast_GEOS-FP/releases/tag/geos%2Fv0.3.1) | -| [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v3.7.1](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v3.7.1) | +| [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v3.8.0](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v3.8.0) | | [GEOS_Util](https://github.com/GEOS-ESM/GEOS_Util) | [v2.1.11](https://github.com/GEOS-ESM/GEOS_Util/releases/tag/v2.1.11) | | [geos_state_bias](https://github.com/GEOS-ESM/geos_state_bias) | [geos/v1.0.0](https://github.com/GEOS-ESM/geos_state_bias/releases/tag/geos/v1.0.0) | | [GEOSchem_GridComp](https://github.com/GEOS-ESM/GEOSchem_GridComp) | [v1.16.0](https://github.com/GEOS-ESM/GEOSchem_GridComp/releases/tag/v1.16.0) | diff --git a/components.yaml b/components.yaml index 236813c4..fb8fc6eb 100644 --- a/components.yaml +++ b/components.yaml @@ -171,7 +171,7 @@ ACHEM: GEOS_OceanGridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp remote: ../GEOS_OceanGridComp.git - tag: v3.7.1 + tag: v3.8.0 develop: develop mom: From 976423925b5ecd92873cc8b33e45a56ad9cf7ae2 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 17 Feb 2026 15:09:06 -0500 Subject: [PATCH 202/241] v12: Update to MAPL 2.66.0 --- CMakeLists.txt | 2 +- README.md | 2 +- components.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 450f7039..9984d141 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -94,7 +94,7 @@ if (NOT Baselibs_FOUND) target_link_libraries(FMS::fms_r8 INTERFACE ${LIBYAML_LIBRARIES}) endif () - find_package(MAPL 2.65 QUIET) + find_package(MAPL 2.66 QUIET) if (MAPL_FOUND) message(STATUS "Found MAPL: ${MAPL_BASE_DIR} (found version \"${MAPL_VERSION})\"") endif () diff --git a/README.md b/README.md index 56c5020c..2d8c7ef3 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ | [HEMCO](https://github.com/GEOS-ESM/HEMCO) | [geos/v2.3.0](https://github.com/GEOS-ESM/HEMCO/releases/tag/geos%2Fv2.3.0) | | [Icepack](https://github.com/GEOS-ESM/Icepack) | [geos/v0.3.0](https://github.com/GEOS-ESM/Icepack/releases/tag/geos%2Fv0.3.0) | | [MAM](https://github.com/GEOS-ESM/MAM) | [v1.1.0](https://github.com/GEOS-ESM/MAM/releases/tag/v1.1.0) | -| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.65.0](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.65.0) | +| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.66.0](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.66.0) | | [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) | diff --git a/components.yaml b/components.yaml index 236813c4..09b55963 100644 --- a/components.yaml +++ b/components.yaml @@ -50,7 +50,7 @@ GMAO_perllib: MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - tag: v2.65.0 + tag: v2.66.0 develop: develop GEOSgcm_GridComp: From 1dff762113e8358fa7ee938635a1f6c1bd4e7de2 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 25 Feb 2026 08:21:07 -0500 Subject: [PATCH 203/241] Update to ecbuild geos/v3.13.1 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e8533a5b..47cf5567 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ | [CARMA](https://github.com/GEOS-ESM/CARMA) | [v1.1.0](https://github.com/GEOS-ESM/CARMA/releases/tag/v1.1.0) | | [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.11.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv3.11.0) | +| [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.33.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.33.0) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.17.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.17.0) | | [FMS](https://github.com/GEOS-ESM/FMS) | [geos/2019.01.02+noaff.10](https://github.com/GEOS-ESM/FMS/releases/tag/geos%2F2019.01.02%2Bnoaff.10) | diff --git a/components.yaml b/components.yaml index 82e36271..5ce74ac8 100644 --- a/components.yaml +++ b/components.yaml @@ -17,7 +17,7 @@ cmake: ecbuild: local: ./@cmake/@ecbuild remote: ../ecbuild.git - tag: geos/v3.11.0 + tag: geos/v3.13.1 NCEP_Shared: local: ./src/Shared/@NCEP_Shared From 56c3dd88547fd29cd86be97267dd194011b24505 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 26 Feb 2026 14:01:15 -0500 Subject: [PATCH 204/241] Update to ecbuild 3.13.1 --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index 4ca31e64..9e25bd3d 100644 --- a/components.yaml +++ b/components.yaml @@ -17,7 +17,7 @@ cmake: ecbuild: local: ./@cmake/@ecbuild remote: ../ecbuild.git - tag: geos/v3.11.0 + tag: geos/v3.13.1 NCEP_Shared: local: ./src/Shared/@NCEP_Shared From 17e50ac30ed00b67b65a45b046e43a22f89a97a6 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 27 Feb 2026 10:57:52 -0500 Subject: [PATCH 205/241] Update to MAPL 2.67.0 --- CMakeLists.txt | 2 +- README.md | 2 +- components.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9984d141..2da7653a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -94,7 +94,7 @@ if (NOT Baselibs_FOUND) target_link_libraries(FMS::fms_r8 INTERFACE ${LIBYAML_LIBRARIES}) endif () - find_package(MAPL 2.66 QUIET) + find_package(MAPL 2.67 QUIET) if (MAPL_FOUND) message(STATUS "Found MAPL: ${MAPL_BASE_DIR} (found version \"${MAPL_VERSION})\"") endif () diff --git a/README.md b/README.md index 2d8c7ef3..d4c55e0a 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ | [HEMCO](https://github.com/GEOS-ESM/HEMCO) | [geos/v2.3.0](https://github.com/GEOS-ESM/HEMCO/releases/tag/geos%2Fv2.3.0) | | [Icepack](https://github.com/GEOS-ESM/Icepack) | [geos/v0.3.0](https://github.com/GEOS-ESM/Icepack/releases/tag/geos%2Fv0.3.0) | | [MAM](https://github.com/GEOS-ESM/MAM) | [v1.1.0](https://github.com/GEOS-ESM/MAM/releases/tag/v1.1.0) | -| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.66.0](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.66.0) | +| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.67.0](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.67.0) | | [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) | diff --git a/components.yaml b/components.yaml index 09b55963..f2dc8bb3 100644 --- a/components.yaml +++ b/components.yaml @@ -50,7 +50,7 @@ GMAO_perllib: MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - tag: v2.66.0 + tag: v2.67.0 develop: develop GEOSgcm_GridComp: From 96b728872ada0a65cbc58404d8066b4817ba3ff5 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 3 Mar 2026 11:43:25 -0500 Subject: [PATCH 206/241] Update to ESMA_cmake v4.33.1 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 47cf5567..d148d40e 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ | [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.33.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.33.0) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.33.1](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.33.1) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.17.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.17.0) | | [FMS](https://github.com/GEOS-ESM/FMS) | [geos/2019.01.02+noaff.10](https://github.com/GEOS-ESM/FMS/releases/tag/geos%2F2019.01.02%2Bnoaff.10) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.15.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.15.0) | diff --git a/components.yaml b/components.yaml index 5ce74ac8..74e2b2e3 100644 --- a/components.yaml +++ b/components.yaml @@ -11,7 +11,7 @@ env: cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v4.33.0 + tag: v4.33.1 develop: develop ecbuild: From 2f4e62fc7837942233df27369453e84c12b9886c Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 3 Mar 2026 11:45:11 -0500 Subject: [PATCH 207/241] Update to ESMA_cmake v5.5.1 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3de0f9ce..09be0504 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ | [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.11.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv3.11.0) | -| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v5.5.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v5.5.0) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v5.5.1](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v5.5.1) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v6.1.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v6.1.0) | | [FMS](https://github.com/GEOS-ESM/FMS) | [geos/2019.01.02+noaff.10](https://github.com/GEOS-ESM/FMS/releases/tag/geos%2F2019.01.02%2Bnoaff.10) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.15.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.15.0) | From 142abf2d54e70ff2146cf54244b4a9f0466210b0 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 3 Mar 2026 11:45:28 -0500 Subject: [PATCH 208/241] Update to ESMA_cmake v5.5.1. Try2 --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index 9e25bd3d..515d8437 100644 --- a/components.yaml +++ b/components.yaml @@ -11,7 +11,7 @@ env: cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v5.5.0 + tag: v5.5.1 develop: develop ecbuild: From ea9da65fd1680f9a954e280db5aaaa3a9c10d304 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 5 Mar 2026 07:44:14 -0500 Subject: [PATCH 209/241] Fix up bad merge --- README.md | 4 ++-- components.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 6121482d..089a13ec 100644 --- a/README.md +++ b/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.33.1](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.33.1) | -| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.17.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.17.0) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v5.6.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v5.6.0) | +| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v6.2.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v6.2.0) | | [FMS](https://github.com/GEOS-ESM/FMS) | [geos/2019.01.02+noaff.10](https://github.com/GEOS-ESM/FMS/releases/tag/geos%2F2019.01.02%2Bnoaff.10) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.15.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.15.0) | | [GAAS](https://github.com/GEOS-ESM/GAAS) | [v1.0.0](https://github.com/GEOS-ESM/GAAS/releases/tag/v1.0.0) | diff --git a/components.yaml b/components.yaml index 515d8437..4edca416 100644 --- a/components.yaml +++ b/components.yaml @@ -5,13 +5,13 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v6.1.0 + tag: v6.2.0 develop: main cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v5.5.1 + tag: v5.6.0 develop: develop ecbuild: From 55dbf4d8592a97d8e117e76593c8d4a3142d4372 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 5 Mar 2026 07:46:41 -0500 Subject: [PATCH 210/241] v12: Update to ESMA_cmake v4.34.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d148d40e..542fe7fd 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ | [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.33.1](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.33.1) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.34.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.34.0) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.17.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.17.0) | | [FMS](https://github.com/GEOS-ESM/FMS) | [geos/2019.01.02+noaff.10](https://github.com/GEOS-ESM/FMS/releases/tag/geos%2F2019.01.02%2Bnoaff.10) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.15.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.15.0) | diff --git a/components.yaml b/components.yaml index 74e2b2e3..74c73bb5 100644 --- a/components.yaml +++ b/components.yaml @@ -11,7 +11,7 @@ env: cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v4.33.1 + tag: v4.34.0 develop: develop ecbuild: From 1410a8db05fb707825741f15c60559074fdcbc60 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 6 Mar 2026 14:11:22 -0500 Subject: [PATCH 211/241] Move to Ocean GC 3.9.0 and mom6 geos/v3.8 --- README.md | 4 ++-- components.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 3bb83a1c..6e6d071a 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ | [GAAS](https://github.com/GEOS-ESM/GAAS) | [v1.0.0](https://github.com/GEOS-ESM/GAAS/releases/tag/v1.0.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) | | [GenCast-GEOS_FP](https://github.com/GEOS-ESM/GenCast_GEOS-FP) | [geos/v0.3.1](https://github.com/GEOS-ESM/GenCast_GEOS-FP/releases/tag/geos%2Fv0.3.1) | -| [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v3.8.0](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v3.8.0) | +| [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v3.9.0](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v3.9.0) | | [GEOS_Util](https://github.com/GEOS-ESM/GEOS_Util) | [v2.1.11](https://github.com/GEOS-ESM/GEOS_Util/releases/tag/v2.1.11) | | [geos_state_bias](https://github.com/GEOS-ESM/geos_state_bias) | [geos/v1.0.0](https://github.com/GEOS-ESM/geos_state_bias/releases/tag/geos/v1.0.0) | | [GEOSchem_GridComp](https://github.com/GEOS-ESM/GEOSchem_GridComp) | [v1.16.0](https://github.com/GEOS-ESM/GEOSchem_GridComp/releases/tag/v1.16.0) | @@ -43,7 +43,7 @@ | [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.7](https://github.com/GEOS-ESM/MOM6/tree/geos/v3.7) | +| [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.4.0](https://github.com/GEOS-ESM/NCEP_Shared/releases/tag/v1.4.0) | | [QuickChem](https://github.com/GEOS-ESM/QuickChem) | [v1.0.0](https://github.com/GEOS-ESM/QuickChem/releases/tag/v1.0.0) | | [RRG](https://github.com/GEOS-ESM/RRG) | [v1.1.0](https://github.com/GEOS-ESM/RRG/releases/tag/v1.1.0) | diff --git a/components.yaml b/components.yaml index 19d94fd5..fc14b5f3 100644 --- a/components.yaml +++ b/components.yaml @@ -171,7 +171,7 @@ ACHEM: GEOS_OceanGridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp remote: ../GEOS_OceanGridComp.git - tag: v3.8.0 + tag: v3.9.0 develop: develop mom: @@ -183,7 +183,7 @@ mom: mom6: local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp/MOM6_GEOSPlug/@mom6 remote: ../MOM6.git - tag: geos/v3.7 + tag: geos/v3.8 develop: geos/main recurse_submodules: true From 136965d6ef7130fa2eff5d994ae0769d0da081d5 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 9 Mar 2026 12:17:45 -0400 Subject: [PATCH 212/241] v12: Update label enforcer with agcm and ogcm diff labels --- .github/workflows/enforce-labels.yml | 30 +++++++++++++++++++++++++-- .github/workflows/push-to-main.yml | 2 +- .github/workflows/release-tarball.yml | 2 +- 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/.github/workflows/enforce-labels.yml b/.github/workflows/enforce-labels.yml index 4a9320c4..83694e6e 100644 --- a/.github/workflows/enforce-labels.yml +++ b/.github/workflows/enforce-labels.yml @@ -14,9 +14,35 @@ jobs: with: mode: minimum count: 1 - labels: "0 diff,0 diff trivial,Non 0-diff,0 diff structural,0-diff trivial,Not 0-diff,0-diff,automatic,0-diff uncoupled,github_actions" + labels: "0 diff agcm,non 0-diff agcm" add_comment: true - message: "This PR is being prevented from merging because you have not added one of our required labels: {{ provided }}. Please add one so that the PR can be merged." + message: "This PR is being prevented from merging because you have not added one of our required labels to say if they are 0-diff or non-0-diff for uncoulped dataocean runs: {{ provided }}. Please add so that the PR can be merged." + + require-ogcm-label: + runs-on: ubuntu-latest + steps: + - uses: mheap/github-action-required-labels@v5 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + mode: minimum + count: 1 + labels: "0 diff ogcm,non 0-diff ogcm" + add_comment: true + message: "This PR is being prevented from merging because you have not added one of our required labels to say if they are 0-diff or non-0-diff for coupled mom6 runs: {{ provided }}. Please add so that the PR can be merged." + + #require-dataatm-label: + #runs-on: ubuntu-latest + #steps: + #- uses: mheap/github-action-required-labels@v5 + #env: + #GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + #with: + #mode: minimum + #count: 1 + #labels: "0 diff dataatm,non 0-diff ogcm" + #add_comment: true + #message: "This PR is being prevented from merging because you have not added one of our required labels to say if they are 0-diff or non-0-diff for coupled dataatm mom6 runs: {{ provided }}. Please add so that the PR can be merged." blocking-label: runs-on: ubuntu-latest diff --git a/.github/workflows/push-to-main.yml b/.github/workflows/push-to-main.yml index ee577059..0cb73a4f 100644 --- a/.github/workflows/push-to-main.yml +++ b/.github/workflows/push-to-main.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repo - uses: actions/checkout@v5 + uses: actions/checkout@v6 with: fetch-depth: 0 - name: Run the action diff --git a/.github/workflows/release-tarball.yml b/.github/workflows/release-tarball.yml index b122f765..2b4a9ceb 100644 --- a/.github/workflows/release-tarball.yml +++ b/.github/workflows/release-tarball.yml @@ -10,7 +10,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v5 + uses: actions/checkout@v6 with: path: ${{ github.event.repository.name }}-${{ github.event.release.tag_name }} From 25f133086e15020d1df77dc0c2bc952d7437a164 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 9 Mar 2026 12:25:00 -0400 Subject: [PATCH 213/241] Bring back some labels --- .github/workflows/enforce-labels.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/enforce-labels.yml b/.github/workflows/enforce-labels.yml index 83694e6e..c7ffcf6b 100644 --- a/.github/workflows/enforce-labels.yml +++ b/.github/workflows/enforce-labels.yml @@ -5,7 +5,7 @@ on: types: [opened, labeled, unlabeled, edited, synchronize] jobs: - require-label: + require-agcm-label: runs-on: ubuntu-latest steps: - uses: mheap/github-action-required-labels@v5 @@ -14,7 +14,7 @@ jobs: with: mode: minimum count: 1 - labels: "0 diff agcm,non 0-diff agcm" + labels: "0 diff agcm,non 0-diff agcm,0-diff structural,0-diff trivial,automatic,github_actions" add_comment: true message: "This PR is being prevented from merging because you have not added one of our required labels to say if they are 0-diff or non-0-diff for uncoulped dataocean runs: {{ provided }}. Please add so that the PR can be merged." @@ -27,7 +27,7 @@ jobs: with: mode: minimum count: 1 - labels: "0 diff ogcm,non 0-diff ogcm" + labels: "0 diff ogcm,non 0-diff ogcm,0-diff structural,0-diff trivial,automatic,github_actions" add_comment: true message: "This PR is being prevented from merging because you have not added one of our required labels to say if they are 0-diff or non-0-diff for coupled mom6 runs: {{ provided }}. Please add so that the PR can be merged." @@ -40,7 +40,7 @@ jobs: #with: #mode: minimum #count: 1 - #labels: "0 diff dataatm,non 0-diff ogcm" + #labels: "0 diff dataatm,non 0-diff ogcm,0-diff structural,0-diff trivial,automatic,github_actions" #add_comment: true #message: "This PR is being prevented from merging because you have not added one of our required labels to say if they are 0-diff or non-0-diff for coupled dataatm mom6 runs: {{ provided }}. Please add so that the PR can be merged." From c7e550e65e0dfb393ddd692817f0f824abe1a73f Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 9 Mar 2026 12:26:25 -0400 Subject: [PATCH 214/241] Bring back some labels. Try2 --- .github/workflows/enforce-labels.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/enforce-labels.yml b/.github/workflows/enforce-labels.yml index c7ffcf6b..151bc918 100644 --- a/.github/workflows/enforce-labels.yml +++ b/.github/workflows/enforce-labels.yml @@ -14,7 +14,7 @@ jobs: with: mode: minimum count: 1 - labels: "0 diff agcm,non 0-diff agcm,0-diff structural,0-diff trivial,automatic,github_actions" + labels: "0-diff agcm,non-0-diff agcm,0-diff structural,0-diff trivial,automatic,github_actions" add_comment: true message: "This PR is being prevented from merging because you have not added one of our required labels to say if they are 0-diff or non-0-diff for uncoulped dataocean runs: {{ provided }}. Please add so that the PR can be merged." @@ -27,7 +27,7 @@ jobs: with: mode: minimum count: 1 - labels: "0 diff ogcm,non 0-diff ogcm,0-diff structural,0-diff trivial,automatic,github_actions" + labels: "0-diff ogcm,non-0-diff ogcm,0-diff structural,0-diff trivial,automatic,github_actions" add_comment: true message: "This PR is being prevented from merging because you have not added one of our required labels to say if they are 0-diff or non-0-diff for coupled mom6 runs: {{ provided }}. Please add so that the PR can be merged." @@ -40,7 +40,7 @@ jobs: #with: #mode: minimum #count: 1 - #labels: "0 diff dataatm,non 0-diff ogcm,0-diff structural,0-diff trivial,automatic,github_actions" + #labels: "0-diff dataatm,non-0-diff ogcm,0-diff structural,0-diff trivial,automatic,github_actions" #add_comment: true #message: "This PR is being prevented from merging because you have not added one of our required labels to say if they are 0-diff or non-0-diff for coupled dataatm mom6 runs: {{ provided }}. Please add so that the PR can be merged." From 551252b745e5cdf3d08c8a72bee61a581d43e8d9 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 9 Mar 2026 13:16:48 -0400 Subject: [PATCH 215/241] Update to ESMA_cmake v4.35.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 542fe7fd..08c596fa 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ | [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.34.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.34.0) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.35.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.35.0) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.17.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.17.0) | | [FMS](https://github.com/GEOS-ESM/FMS) | [geos/2019.01.02+noaff.10](https://github.com/GEOS-ESM/FMS/releases/tag/geos%2F2019.01.02%2Bnoaff.10) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.15.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.15.0) | diff --git a/components.yaml b/components.yaml index 74c73bb5..fa94fe9d 100644 --- a/components.yaml +++ b/components.yaml @@ -11,7 +11,7 @@ env: cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v4.34.0 + tag: v4.35.0 develop: develop ecbuild: From 75eb63658a27eb96950b75c0fc5621d450a165ed Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 9 Mar 2026 13:17:46 -0400 Subject: [PATCH 216/241] Update to ESMA_cmake v5.7.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 089a13ec..52b8f7a5 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ | [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) | [v5.6.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v5.6.0) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v5.7.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v5.7.0) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v6.2.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v6.2.0) | | [FMS](https://github.com/GEOS-ESM/FMS) | [geos/2019.01.02+noaff.10](https://github.com/GEOS-ESM/FMS/releases/tag/geos%2F2019.01.02%2Bnoaff.10) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.15.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.15.0) | diff --git a/components.yaml b/components.yaml index 4edca416..0ee8cd76 100644 --- a/components.yaml +++ b/components.yaml @@ -11,7 +11,7 @@ env: cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v5.6.0 + tag: v5.7.0 develop: develop ecbuild: From b0da7a57b5b781b859c8e9c837ec375fbc3dabe5 Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst Date: Tue, 10 Mar 2026 16:10:21 -0400 Subject: [PATCH 217/241] Uptick to GCMv12-rc24 tag with L72 updates --- components.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components.yaml b/components.yaml index 74e2b2e3..bb8b10ba 100644 --- a/components.yaml +++ b/components.yaml @@ -56,7 +56,7 @@ MAPL: GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - tag: GCMv12-rc23 + tag: GCMv12-rc24 sparse: ./config/GEOSgcm_GridComp.sparse develop: feature/sdrabenh/gcm_v12 @@ -75,13 +75,13 @@ GigaTraj: FVdycoreCubed_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp remote: ../FVdycoreCubed_GridComp.git - tag: GCMv12-rc21 + tag: GCMv12-rc24 develop: feature/sdrabenh/gcm_v12 fvdycore: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp/@fvdycore remote: ../GFDL_atmos_cubed_sphere.git - tag: GCMv12-rc21 + tag: GCMv12-rc24 develop: feature/sdrabenh/gcm_v12 GEOSchem_GridComp: @@ -239,7 +239,7 @@ umwm: GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git - tag: GCMv12-rc23 + tag: GCMv12-rc24 develop: feature/sdrabenh/gcm_v12 UMD_Etc: From 1716c5bb74ce05499938918d07dd5f7793c79c58 Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst Date: Fri, 13 Mar 2026 13:48:54 -0400 Subject: [PATCH 218/241] Uptick to GCMv12-rc25 --- components.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/components.yaml b/components.yaml index e8adaf2a..7d1e1d2d 100644 --- a/components.yaml +++ b/components.yaml @@ -29,14 +29,14 @@ NCEP_Shared: GMAO_Shared: local: ./src/Shared/@GMAO_Shared remote: ../GMAO_Shared.git - tag: GCMv12-rc22 + tag: GCMv12-rc25 sparse: ./config/GMAO_Shared.sparse develop: feature/sdrabenh/gcm_v12 GEOS_Util: local: ./src/Shared/@GMAO_Shared/@GEOS_Util remote: ../GEOS_Util.git - tag: GCMv12-rc22 + tag: GCMv12-rc25 develop: feature/sdrabenh/gcm_v12 GMAO_perllib: @@ -56,7 +56,7 @@ MAPL: GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - tag: GCMv12-rc24 + tag: GCMv12-rc25 sparse: ./config/GEOSgcm_GridComp.sparse develop: feature/sdrabenh/gcm_v12 @@ -75,19 +75,19 @@ GigaTraj: FVdycoreCubed_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp remote: ../FVdycoreCubed_GridComp.git - tag: GCMv12-rc24 + tag: GCMv12-rc25 develop: feature/sdrabenh/gcm_v12 fvdycore: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp/@fvdycore remote: ../GFDL_atmos_cubed_sphere.git - tag: GCMv12-rc24 + tag: GCMv12-rc25 develop: feature/sdrabenh/gcm_v12 GEOSchem_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp remote: ../GEOSchem_GridComp.git - tag: GCMv12-rc22 + tag: GCMv12-rc25 develop: feature/sdrabenh/gcm_v12 HEMCO: @@ -105,7 +105,7 @@ geos-chem: GOCART: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@GOCART remote: ../GOCART.git - tag: GCMv12-rc23 + tag: GCMv12-rc25 develop: feature/sdrabenh/gcm_v12 QuickChem: @@ -214,7 +214,7 @@ sis2: GEOSradiation_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSradiation_GridComp remote: ../GEOSradiation_GridComp.git - tag: GCMv12-rc20 + tag: GCMv12-rc25 develop: feature/sdrabenh/gcm_v12 RRTMGP: @@ -239,7 +239,7 @@ umwm: GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git - tag: GCMv12-rc24 + tag: GCMv12-rc25 develop: feature/sdrabenh/gcm_v12 UMD_Etc: From 7c781d7fa9e0053b1e6047b01a0c86559d1a2754 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 18 Mar 2026 14:07:52 -0400 Subject: [PATCH 219/241] v12: Update to ESMA_env v5.19.0 --- .circleci/config.yml | 2 +- README.md | 2 +- components.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f0d14bea..496a3fa6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,7 +16,7 @@ parameters: # Anchors to prevent forgetting to update a version os_version: &os_version ubuntu24 -baselibs_version: &baselibs_version v8.24.0 +baselibs_version: &baselibs_version v8.27.0 bcs_version: &bcs_version v12.0.0 tag_build_arg_name: &tag_build_arg_name gcmversion diff --git a/README.md b/README.md index 1328f515..04aa2ef8 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ | [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.35.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.35.0) | -| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.17.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.17.0) | +| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.19.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.19.0) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.16.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.16.1) | | [GAAS](https://github.com/GEOS-ESM/GAAS) | [v1.0.0](https://github.com/GEOS-ESM/GAAS/releases/tag/v1.0.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) | diff --git a/components.yaml b/components.yaml index 7d1e1d2d..e310b225 100644 --- a/components.yaml +++ b/components.yaml @@ -5,7 +5,7 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v5.18.0 + tag: v5.19.0 develop: main cmake: From 019334f72bd0f1a58781d5379d32c36a01a17a81 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 18 Mar 2026 14:11:35 -0400 Subject: [PATCH 220/241] update to baselibs 9.7.1 --- .circleci/config.yml | 2 +- .github/workflows/workflow.yml | 2 +- README.md | 2 +- components.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 174b4424..48982f90 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,7 +16,7 @@ parameters: # Anchors to prevent forgetting to update a version os_version: &os_version ubuntu24 -baselibs_version: &baselibs_version v9.4.0 +baselibs_version: &baselibs_version v9.7.1 bcs_version: &bcs_version v12.0.0 tag_build_arg_name: &tag_build_arg_name gcmversion diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 3d016c4a..69f72cc4 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -31,7 +31,7 @@ jobs: # 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.4.0 + baselibs-version: v9.7.1 spack_build: uses: GEOS-ESM/CI-workflows/.github/workflows/spack_gcc_build.yml@project/geosgcm diff --git a/README.md b/README.md index 6602ce27..748cc6b2 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ | [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) | [v5.7.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v5.7.0) | -| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v6.2.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v6.2.0) | +| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v6.3.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v6.3.0) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.16.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.16.1) | | [GAAS](https://github.com/GEOS-ESM/GAAS) | [v1.0.0](https://github.com/GEOS-ESM/GAAS/releases/tag/v1.0.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) | diff --git a/components.yaml b/components.yaml index 640f4677..87dfab88 100644 --- a/components.yaml +++ b/components.yaml @@ -5,7 +5,7 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v6.2.0 + tag: v6.3.0 develop: main cmake: From ccaba21e368b91186062e3a72b1adfd437394373 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 19 Mar 2026 09:48:13 -0400 Subject: [PATCH 221/241] v12: Update ESMA_env to 5.19.1 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 04aa2ef8..89865121 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ | [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.35.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.35.0) | -| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.19.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.19.0) | +| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.19.1](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.19.1) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.16.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.16.1) | | [GAAS](https://github.com/GEOS-ESM/GAAS) | [v1.0.0](https://github.com/GEOS-ESM/GAAS/releases/tag/v1.0.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) | diff --git a/components.yaml b/components.yaml index e310b225..ce4e838d 100644 --- a/components.yaml +++ b/components.yaml @@ -5,7 +5,7 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v5.19.0 + tag: v5.19.1 develop: main cmake: From 0cd83a87b1f8f33fc21251715524fc16ef6499a2 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 19 Mar 2026 09:49:14 -0400 Subject: [PATCH 222/241] Update ESMA_env to 6.3.1 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 748cc6b2..b17abaa0 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ | [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) | [v5.7.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v5.7.0) | -| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v6.3.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v6.3.0) | +| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v6.3.1](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v6.3.1) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.16.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.16.1) | | [GAAS](https://github.com/GEOS-ESM/GAAS) | [v1.0.0](https://github.com/GEOS-ESM/GAAS/releases/tag/v1.0.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) | diff --git a/components.yaml b/components.yaml index 87dfab88..822a2d6a 100644 --- a/components.yaml +++ b/components.yaml @@ -5,7 +5,7 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v6.3.0 + tag: v6.3.1 develop: main cmake: From 7b34dab109c8a4a00bd9f3161cbdcfd041efd383 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 25 Mar 2026 08:09:28 -0400 Subject: [PATCH 223/241] Update to ESMA_env v6.4.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b17abaa0..48105629 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ | [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) | [v5.7.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v5.7.0) | -| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v6.3.1](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v6.3.1) | +| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v6.4.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v6.4.0) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.16.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.16.1) | | [GAAS](https://github.com/GEOS-ESM/GAAS) | [v1.0.0](https://github.com/GEOS-ESM/GAAS/releases/tag/v1.0.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) | diff --git a/components.yaml b/components.yaml index 822a2d6a..065dadc2 100644 --- a/components.yaml +++ b/components.yaml @@ -5,7 +5,7 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v6.3.1 + tag: v6.4.0 develop: main cmake: From d22cda2f4a0fcf9620f0a00df12d071ea0dfb5c0 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 25 Mar 2026 08:11:49 -0400 Subject: [PATCH 224/241] v12: Update ESMA_env to 5.20.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 89865121..a58b31c1 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ | [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.35.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.35.0) | -| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.19.1](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.19.1) | +| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.20.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.20.0) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.16.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.16.1) | | [GAAS](https://github.com/GEOS-ESM/GAAS) | [v1.0.0](https://github.com/GEOS-ESM/GAAS/releases/tag/v1.0.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) | diff --git a/components.yaml b/components.yaml index ce4e838d..5ec54e17 100644 --- a/components.yaml +++ b/components.yaml @@ -5,7 +5,7 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v5.19.1 + tag: v5.20.0 develop: main cmake: From 47a1ff1c85b003eb51999a391e1b678c342eed41 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 26 Mar 2026 11:36:48 -0400 Subject: [PATCH 225/241] Update to ESMA_env v5.21.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a58b31c1..e5f4a252 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ | [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.35.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.35.0) | -| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.20.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.20.0) | +| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.21.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.21.0) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.16.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.16.1) | | [GAAS](https://github.com/GEOS-ESM/GAAS) | [v1.0.0](https://github.com/GEOS-ESM/GAAS/releases/tag/v1.0.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) | diff --git a/components.yaml b/components.yaml index 5ec54e17..adf77ddc 100644 --- a/components.yaml +++ b/components.yaml @@ -5,7 +5,7 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v5.20.0 + tag: v5.21.0 develop: main cmake: From c65c94aa79121eaca15b84027b2348abaeefa2b6 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 26 Mar 2026 11:37:55 -0400 Subject: [PATCH 226/241] Update to ESMA_env v6.5.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 48105629..a65ea328 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ | [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) | [v5.7.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v5.7.0) | -| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v6.4.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v6.4.0) | +| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v6.5.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v6.5.0) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.16.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.16.1) | | [GAAS](https://github.com/GEOS-ESM/GAAS) | [v1.0.0](https://github.com/GEOS-ESM/GAAS/releases/tag/v1.0.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) | diff --git a/components.yaml b/components.yaml index 065dadc2..0997e496 100644 --- a/components.yaml +++ b/components.yaml @@ -5,7 +5,7 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v6.4.0 + tag: v6.5.0 develop: main cmake: From 1185b4b1d5440c71c5a1179b24c819fb9309c15a Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst Date: Fri, 27 Mar 2026 16:46:43 -0400 Subject: [PATCH 227/241] Uptick to GCMv12-rc26 --- components.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components.yaml b/components.yaml index adf77ddc..cbf94eef 100644 --- a/components.yaml +++ b/components.yaml @@ -36,7 +36,7 @@ GMAO_Shared: GEOS_Util: local: ./src/Shared/@GMAO_Shared/@GEOS_Util remote: ../GEOS_Util.git - tag: GCMv12-rc25 + tag: GCMv12-rc26 develop: feature/sdrabenh/gcm_v12 GMAO_perllib: @@ -56,7 +56,7 @@ MAPL: GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - tag: GCMv12-rc25 + tag: GCMv12-rc26 sparse: ./config/GEOSgcm_GridComp.sparse develop: feature/sdrabenh/gcm_v12 @@ -239,7 +239,7 @@ umwm: GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git - tag: GCMv12-rc25 + tag: GCMv12-rc26 develop: feature/sdrabenh/gcm_v12 UMD_Etc: From 683e5c7005669c40edefa55e9e0f2732f647b816 Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst Date: Fri, 27 Mar 2026 21:49:49 -0400 Subject: [PATCH 228/241] Uptick to GCMv12-rc27 using refactored GF2020 --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index cbf94eef..314a6314 100644 --- a/components.yaml +++ b/components.yaml @@ -56,7 +56,7 @@ MAPL: GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - tag: GCMv12-rc26 + tag: GCMv12-rc27 sparse: ./config/GEOSgcm_GridComp.sparse develop: feature/sdrabenh/gcm_v12 From e4dea049fb868e195156e435c83de475f6a7bc68 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 1 Apr 2026 10:43:24 -0400 Subject: [PATCH 229/241] v12: Update to ESMA_cmake v4.36.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e5f4a252..bd291e97 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ | [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.35.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.35.0) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v4.36.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v4.36.0) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v5.21.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v5.21.0) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.16.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.16.1) | | [GAAS](https://github.com/GEOS-ESM/GAAS) | [v1.0.0](https://github.com/GEOS-ESM/GAAS/releases/tag/v1.0.0) | diff --git a/components.yaml b/components.yaml index 314a6314..f8b9fc63 100644 --- a/components.yaml +++ b/components.yaml @@ -11,7 +11,7 @@ env: cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v4.35.0 + tag: v4.36.0 develop: develop ecbuild: From 101e6b75aaf05224ae5bf3262300d53c639472d5 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 7 Apr 2026 10:47:17 -0400 Subject: [PATCH 230/241] v12: Update to MAPL 2.68.0 --- CMakeLists.txt | 2 +- README.md | 2 +- components.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2da7653a..fe6eacfc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -94,7 +94,7 @@ if (NOT Baselibs_FOUND) target_link_libraries(FMS::fms_r8 INTERFACE ${LIBYAML_LIBRARIES}) endif () - find_package(MAPL 2.67 QUIET) + find_package(MAPL 2.68 QUIET) if (MAPL_FOUND) message(STATUS "Found MAPL: ${MAPL_BASE_DIR} (found version \"${MAPL_VERSION})\"") endif () diff --git a/README.md b/README.md index e5f4a252..3fcb37a5 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ | [HEMCO](https://github.com/GEOS-ESM/HEMCO) | [geos/v2.3.0](https://github.com/GEOS-ESM/HEMCO/releases/tag/geos%2Fv2.3.0) | | [Icepack](https://github.com/GEOS-ESM/Icepack) | [geos/v0.3.0](https://github.com/GEOS-ESM/Icepack/releases/tag/geos%2Fv0.3.0) | | [MAM](https://github.com/GEOS-ESM/MAM) | [v1.1.0](https://github.com/GEOS-ESM/MAM/releases/tag/v1.1.0) | -| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.67.0](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.67.0) | +| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.68.0](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.68.0) | | [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) | diff --git a/components.yaml b/components.yaml index 314a6314..620bd23f 100644 --- a/components.yaml +++ b/components.yaml @@ -50,7 +50,7 @@ GMAO_perllib: MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - tag: v2.67.0 + tag: v2.68.0 develop: develop GEOSgcm_GridComp: From 08e069d7e6926da9659a743fef2d59ff6bdee123 Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst Date: Thu, 9 Apr 2026 09:43:05 -0400 Subject: [PATCH 231/241] Uptick to patch GCMv12-rc27p1 --- components.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components.yaml b/components.yaml index 89b3ac1f..ca919298 100644 --- a/components.yaml +++ b/components.yaml @@ -56,7 +56,7 @@ MAPL: GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - tag: GCMv12-rc27 + tag: GCMv12-rc27p1 sparse: ./config/GEOSgcm_GridComp.sparse develop: feature/sdrabenh/gcm_v12 @@ -239,7 +239,7 @@ umwm: GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git - tag: GCMv12-rc26 + tag: GCMv12-rc27p1 develop: feature/sdrabenh/gcm_v12 UMD_Etc: From 38a36c0c4d6502fbcc4b623871d8bef6988b767b Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 14 Apr 2026 09:28:40 -0400 Subject: [PATCH 232/241] v12: Switch CICE develop to geos/release/v0 This PR updates the `mepo develop` for cice6 so that it points to a branch based off of `geos/v0.2.0`. We do this because `geos/develop` is now pointing to a further state of development from the main CICE-Consortium fork. --- components.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index ca919298..7ed762a2 100644 --- a/components.yaml +++ b/components.yaml @@ -196,7 +196,10 @@ cice6: local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/GEOSseaice_GridComp/CICE_GEOSPlug/@cice6 remote: ../CICE.git tag: geos/v0.2.0 - develop: geos/develop + # GEOS currently is not in sync with mainline CICE development, so we point to a specific release branch for now. + # Once we are in sync with mainline CICE development, we can point to the develop branch. + #develop: geos/develop + develop: geos/release/v0 ignore_submodules: true icepack: From 7cb6cd87e4d779c7bd7e369ffd20652e4d7aeb5c Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst Date: Tue, 14 Apr 2026 16:26:19 -0400 Subject: [PATCH 233/241] uptick to GCMv12-rc28 --- components.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components.yaml b/components.yaml index 7ed762a2..c0bad975 100644 --- a/components.yaml +++ b/components.yaml @@ -36,7 +36,7 @@ GMAO_Shared: GEOS_Util: local: ./src/Shared/@GMAO_Shared/@GEOS_Util remote: ../GEOS_Util.git - tag: GCMv12-rc26 + tag: GCMv12-rc28 develop: feature/sdrabenh/gcm_v12 GMAO_perllib: @@ -56,7 +56,7 @@ MAPL: GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - tag: GCMv12-rc27p1 + tag: GCMv12-rc28 sparse: ./config/GEOSgcm_GridComp.sparse develop: feature/sdrabenh/gcm_v12 From 114168f6500810fd5af28db6dbebf6fb9ecc76d7 Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst Date: Fri, 17 Apr 2026 10:18:40 -0400 Subject: [PATCH 234/241] Uptick to GCMv12-rc29 --- components.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components.yaml b/components.yaml index c0bad975..cad213f3 100644 --- a/components.yaml +++ b/components.yaml @@ -29,14 +29,14 @@ NCEP_Shared: GMAO_Shared: local: ./src/Shared/@GMAO_Shared remote: ../GMAO_Shared.git - tag: GCMv12-rc25 + tag: GCMv12-rc29 sparse: ./config/GMAO_Shared.sparse develop: feature/sdrabenh/gcm_v12 GEOS_Util: local: ./src/Shared/@GMAO_Shared/@GEOS_Util remote: ../GEOS_Util.git - tag: GCMv12-rc28 + tag: GCMv12-rc29 develop: feature/sdrabenh/gcm_v12 GMAO_perllib: @@ -56,7 +56,7 @@ MAPL: GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - tag: GCMv12-rc28 + tag: GCMv12-rc29 sparse: ./config/GEOSgcm_GridComp.sparse develop: feature/sdrabenh/gcm_v12 @@ -242,7 +242,7 @@ umwm: GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git - tag: GCMv12-rc27p1 + tag: GCMv12-rc29 develop: feature/sdrabenh/gcm_v12 UMD_Etc: From 1e39e805b60cbf4c0e2fb0f0edef49fc8843a428 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 29 Apr 2026 12:32:36 -0400 Subject: [PATCH 235/241] v12: Fix bad fail-fast, load fms --- .github/workflows/workflow.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 84c36827..c26955c4 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -20,6 +20,7 @@ concurrency: jobs: build_gcm: strategy: + fail-fast: false matrix: compiler: [ifort, gfortran-14, gfortran-15, ifx] build-type: [Debug] @@ -27,11 +28,12 @@ jobs: with: compiler: ${{ matrix.compiler }} cmake-build-type: ${{ matrix.build-type }} - fail-fast: false spack_build: uses: GEOS-ESM/CI-workflows/.github/workflows/spack_gcc_build.yml@project/geosgcm secrets: BUILDCACHE_USERNAME: ${{ secrets.BUILDCACHE_USERNAME }} BUILDCACHE_TOKEN: ${{ secrets.BUILDCACHE_TOKEN }} + with: + load-fms: true From 2f8201ddfd694906f72781869f973582db466a45 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 5 May 2026 09:27:20 -0400 Subject: [PATCH 236/241] Fix bad merge --- components.yaml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/components.yaml b/components.yaml index 23230536..a8524ce5 100644 --- a/components.yaml +++ b/components.yaml @@ -56,12 +56,8 @@ MAPL: GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git -<<<<<<< HEAD - #tag: GCMv12-rc27 + #tag: GCMv12-rc29 branch: feature/v12-remove-mom5 -======= - tag: GCMv12-rc29 ->>>>>>> feature/sdrabenh/gcm_v12 sparse: ./config/GEOSgcm_GridComp.sparse develop: feature/sdrabenh/gcm_v12 @@ -244,12 +240,8 @@ umwm: GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git -<<<<<<< HEAD - #tag: GCMv12-rc26 + #tag: GCMv12-rc29 branch: feature/v12-remove-mom5 -======= - tag: GCMv12-rc29 ->>>>>>> feature/sdrabenh/gcm_v12 develop: feature/sdrabenh/gcm_v12 UMD_Etc: From 30f4816096afd0f1fa922d93bf266716c0d4840e Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 5 May 2026 09:27:55 -0400 Subject: [PATCH 237/241] Update to ESMA_env v6.6.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a77450b6..d607f3ef 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ | [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) | [v5.7.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v5.7.0) | -| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v6.5.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v6.5.0) | +| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v6.6.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v6.6.0) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.16.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.16.1) | | [GAAS](https://github.com/GEOS-ESM/GAAS) | [v1.0.0](https://github.com/GEOS-ESM/GAAS/releases/tag/v1.0.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) | diff --git a/components.yaml b/components.yaml index a8524ce5..5c3b9b74 100644 --- a/components.yaml +++ b/components.yaml @@ -5,7 +5,7 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v6.5.0 + tag: v6.6.0 develop: main cmake: From f7ada011c815c49c5b653c83371fcab0b8f05a0b Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 2 Jun 2026 13:18:25 -0400 Subject: [PATCH 238/241] Fix up bad merge --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 80388dc2..de079f59 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -90,7 +90,7 @@ if (NOT Baselibs_FOUND) target_link_libraries(FMS::fms INTERFACE ${LIBYAML_LIBRARIES}) endif () - find_package(MAPL 2.68 QUIET) + find_package(MAPL 2.69 QUIET) if (MAPL_FOUND) message(STATUS "Found MAPL: ${MAPL_BASE_DIR} (found version \"${MAPL_VERSION})\"") endif () From 126240277e88091b2ba00f635d03a6b625ad3f93 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 2 Jun 2026 13:20:13 -0400 Subject: [PATCH 239/241] Update to ESMA_env v6.7.0 and ESMA_cmake v5.10.0 --- README.md | 4 ++-- components.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index ce6b2794..a0cd034e 100644 --- a/README.md +++ b/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) | [v5.7.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v5.7.0) | -| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v6.6.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v6.6.0) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v5.10.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v5.10.0) | +| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v6.7.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v6.7.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) | diff --git a/components.yaml b/components.yaml index f1f1c622..a28ce930 100644 --- a/components.yaml +++ b/components.yaml @@ -5,13 +5,13 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v6.6.0 + tag: v6.7.0 develop: main cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v5.7.0 + tag: v5.10.0 develop: develop ecbuild: From 4a98d68f51f6be56db1900eb7830aaa33d91aad9 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 4 Jun 2026 11:56:34 -0400 Subject: [PATCH 240/241] Update to ESMA_env v6.8.0 and ESMA_cmake v5.11.0 --- README.md | 4 ++-- components.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index a0cd034e..7ef66670 100644 --- a/README.md +++ b/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) | [v5.10.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v5.10.0) | -| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v6.7.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v6.7.0) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v5.11.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v5.11.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) | diff --git a/components.yaml b/components.yaml index a28ce930..c6e4702a 100644 --- a/components.yaml +++ b/components.yaml @@ -5,13 +5,13 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v6.7.0 + tag: v6.8.0 develop: main cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v5.10.0 + tag: v5.11.0 develop: develop ecbuild: From 7474697b0e6bb080993600d85d460ac20d775180 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 17 Jun 2026 12:27:49 -0400 Subject: [PATCH 241/241] Update to ESMA_cmake v5.12.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7ef66670..89789d61 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ | [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) | [v5.11.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v5.11.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) | diff --git a/components.yaml b/components.yaml index c6e4702a..d81fcbfa 100644 --- a/components.yaml +++ b/components.yaml @@ -11,7 +11,7 @@ env: cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v5.11.0 + tag: v5.12.0 develop: develop ecbuild: