diff --git a/.circleci/config.yml b/.circleci/config.yml index d5f38daa..b060ecd4 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.4.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 81e1e674..3d016c4a 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -21,12 +21,17 @@ 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 + baselibs-version: v9.4.0 spack_build: uses: GEOS-ESM/CI-workflows/.github/workflows/spack_gcc_build.yml@project/geosgcm diff --git a/CMakeLists.txt b/CMakeLists.txt index 4b306ebd..36b40953 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 2025.4 REQUIRED) # At the moment, there is no way to know if FMS was built with YAML # so we need to rely on the user to set this option. @@ -90,8 +87,7 @@ if (NOT Baselibs_FOUND) find_package(libyaml REQUIRED) message(STATUS "LIBYAML_INCLUDE_DIR: ${LIBYAML_INCLUDE_DIR}") message(STATUS "LIBYAML_LIBRARIES: ${LIBYAML_LIBRARIES}") - target_link_libraries(FMS::fms_r4 INTERFACE ${LIBYAML_LIBRARIES}) - target_link_libraries(FMS::fms_r8 INTERFACE ${LIBYAML_LIBRARIES}) + target_link_libraries(FMS::fms INTERFACE ${LIBYAML_LIBRARIES}) endif () find_package(MAPL 2.64 QUIET) diff --git a/README.md b/README.md index daae2fd0..51e1d983 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.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) | +| [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) | @@ -42,8 +42,7 @@ | [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) | -| [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.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 33f5bd0e..d86c53d7 100644 --- a/components.yaml +++ b/components.yaml @@ -5,13 +5,13 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v5.17.0 + tag: v6.1.0 develop: main cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v4.30.0 + tag: v5.2.0 develop: develop ecbuild: @@ -56,7 +56,8 @@ MAPL: GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - tag: GCMv12-rc21 + #tag: GCMv12-rc21 + branch: feature/v12-remove-mom5 sparse: ./config/GEOSgcm_GridComp.sparse develop: feature/sdrabenh/gcm_v12 @@ -75,13 +76,15 @@ GigaTraj: FVdycoreCubed_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp remote: ../FVdycoreCubed_GridComp.git - tag: GCMv12-rc21 + #tag: GCMv12-rc21 + 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-rc21 + #tag: GCMv12-rc21 + branch: feature/v12-fms2025-useifdef develop: feature/sdrabenh/gcm_v12 GEOSchem_GridComp: @@ -171,15 +174,10 @@ ACHEM: GEOS_OceanGridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp remote: ../GEOS_OceanGridComp.git - tag: v3.7.0 + #tag: v3.7.0 + branch: feature/v12-remove-mom5 develop: develop -mom: - local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp/MOM_GEOS5PlugMod/@mom - remote: ../MOM5.git - tag: geos/5.1.0+2.1.0 - develop: geos5 - mom6: local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp/MOM6_GEOSPlug/@mom6 remote: ../MOM6.git @@ -239,7 +237,8 @@ umwm: GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git - tag: GCMv12-rc21 + #tag: GCMv12-rc21 + branch: feature/v12-remove-mom5 develop: feature/sdrabenh/gcm_v12 UMD_Etc: