diff --git a/.circleci/config.yml b/.circleci/config.yml index 19f37a05..47851170 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -17,11 +17,11 @@ parameters: # Anchors to prevent forgetting to update a version os_version: &os_version ubuntu20 baselibs_version: &baselibs_version v7.25.0 -bcs_version: &bcs_version v11.5.0 +bcs_version: &bcs_version v11.6.0 tag_build_arg_name: &tag_build_arg_name gcmversion orbs: - ci: geos-esm/circleci-tools@2 + ci: geos-esm/circleci-tools@4 workflows: build-test: @@ -75,7 +75,7 @@ workflows: filters: tags: only: /^v.*$/ - name: publish-intel-docker-image + name: publish-ifort-docker-image context: - docker-hub-creds - ghcr-creds @@ -85,8 +85,8 @@ 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 diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index ac458673..7d148d7f 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.25.0-intelmpi_2021.13-intel_2024.2 + image: gmao/ubuntu20-geos-env:v7.25.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 diff --git a/README.md b/README.md index 497e807a..711a423d 100644 --- a/README.md +++ b/README.md @@ -15,17 +15,17 @@ | [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) | [v3.48.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v3.48.0) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v3.51.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v3.51.0) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v4.29.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v4.29.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.12.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.12.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.1.6](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v2.1.6) | +| [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v2.3.0](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v2.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) | | [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) | +| [GEOSradiation_GridComp](https://github.com/GEOS-ESM/GEOSradiation_GridComp) | [v1.9.0](https://github.com/GEOS-ESM/GEOSradiation_GridComp/releases/tag/v1.9.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.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) | @@ -35,7 +35,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+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) | +| [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.7+1.0.0](https://github.com/GEOS-ESM/rte-rrtmgp/releases/tag/geos%2Fv1.7%2B1.0.0) | diff --git a/components.yaml b/components.yaml index c4cca7ca..e95a80e4 100644 --- a/components.yaml +++ b/components.yaml @@ -11,7 +11,7 @@ env: cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v3.48.0 + tag: v3.51.0 develop: develop ecbuild: @@ -121,7 +121,7 @@ StratChem: GEOS_OceanGridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp remote: ../GEOS_OceanGridComp.git - tag: v2.1.6 + tag: v2.3.0 develop: develop mom: @@ -133,7 +133,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.3 develop: main recurse_submodules: true @@ -164,7 +164,7 @@ sis2: GEOSradiation_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSradiation_GridComp remote: ../GEOSradiation_GridComp.git - tag: v1.8.0 + tag: v1.9.0 develop: develop RRTMGP: