diff --git a/.circleci/config.yml b/.circleci/config.yml index ebb6b2e9..f368b5df 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 v7.29.0 +baselibs_version: &baselibs_version v7.31.0 bcs_version: &bcs_version v11.6.0 tag_build_arg_name: &tag_build_arg_name gcmversion diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 47b2f96d..d82e0a57 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:v7.29.0-intelmpi_2021.13-ifort_2021.13 + image: gmao/ubuntu24-geos-env:v7.31.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 b166d20e..3dc3387e 100644 --- a/README.md +++ b/README.md @@ -2,50 +2,55 @@ ## 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 -| Repository | Version | -| ---------- | ------- | -| [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) | [v3.56.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v3.56.0) | +| Repository | Version | +| ---------- | ------- | +| [ACHEM](https://github.com/GEOS-ESM/ACHEM) | [v1.0.0](https://github.com/GEOS-ESM/ACHEM/releases/tag/v1.0.0) | +| [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) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v3.56.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v3.56.0) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v4.35.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v4.35.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.13.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.13.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) | +| [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.4.0](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v2.4.0) | | [GEOS_Util](https://github.com/GEOS-ESM/GEOS_Util) | [v2.1.6](https://github.com/GEOS-ESM/GEOS_Util/releases/tag/v2.1.6) | -| [GEOSchem_GridComp](https://github.com/GEOS-ESM/GEOSchem_GridComp) | [v1.15.0](https://github.com/GEOS-ESM/GEOSchem_GridComp/releases/tag/v1.15.0) | -| [GEOSgcm_App](https://github.com/GEOS-ESM/GEOSgcm_App) | [v2.3.9](https://github.com/GEOS-ESM/GEOSgcm_App/releases/tag/v2.3.9) | -| [GEOSgcm_GridComp](https://github.com/GEOS-ESM/GEOSgcm_GridComp) | [v2.7.1](https://github.com/GEOS-ESM/GEOSgcm_GridComp/releases/tag/v2.7.1) | -| [GEOSradiation_GridComp](https://github.com/GEOS-ESM/GEOSradiation_GridComp) | [v1.11.0](https://github.com/GEOS-ESM/GEOSradiation_GridComp/releases/tag/v1.11.0) | -| [GFDL_atmos_cubed_sphere](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere) | [geos/v2.9.1](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere/releases/tag/geos%2Fv2.9.1) | -| [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_Shared](https://github.com/GEOS-ESM/GMAO_Shared) | [v1.9.9](https://github.com/GEOS-ESM/GMAO_Shared/releases/tag/v1.9.9) | -| [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) | +| [GEOSchem_GridComp](https://github.com/GEOS-ESM/GEOSchem_GridComp) | [v1.16.0](https://github.com/GEOS-ESM/GEOSchem_GridComp/releases/tag/v1.16.0) | +| [GEOSgcm_App](https://github.com/GEOS-ESM/GEOSgcm_App) | [v2.3.10](https://github.com/GEOS-ESM/GEOSgcm_App/releases/tag/v2.3.10) | +| [GEOSgcm_GridComp](https://github.com/GEOS-ESM/GEOSgcm_GridComp) | [v2.7.2](https://github.com/GEOS-ESM/GEOSgcm_GridComp/releases/tag/v2.7.2) | +| [GEOSradiation_GridComp](https://github.com/GEOS-ESM/GEOSradiation_GridComp) | [v1.12.0](https://github.com/GEOS-ESM/GEOSradiation_GridComp/releases/tag/v1.12.0) | +| [GFDL_atmos_cubed_sphere](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere) | [geos/v2.9.1](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere/releases/tag/geos%2Fv2.9.1) | +| [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_Shared](https://github.com/GEOS-ESM/GMAO_Shared) | [v1.9.9](https://github.com/GEOS-ESM/GMAO_Shared/releases/tag/v1.9.9) | +| [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) | | [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.54.1](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.54.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) | +| [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.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) | +| [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) | +| [RRG](https://github.com/GEOS-ESM/RRG) | [v1.1.0](https://github.com/GEOS-ESM/RRG/releases/tag/v1.1.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) | -| [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) | +| [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) | | [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) | +| [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) | ## How to build GEOS GCM diff --git a/components.yaml b/components.yaml index e99549d3..b7deb2f4 100644 --- a/components.yaml +++ b/components.yaml @@ -56,7 +56,7 @@ FMS: GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - tag: v2.7.1 + tag: v2.7.2 sparse: ./config/GEOSgcm_GridComp.sparse develop: develop @@ -81,7 +81,7 @@ fvdycore: GEOSchem_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp remote: ../GEOSchem_GridComp.git - tag: v1.15.0 + tag: v1.16.0 develop: develop HEMCO: @@ -108,6 +108,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 @@ -126,6 +132,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 @@ -172,7 +208,7 @@ sis2: GEOSradiation_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSradiation_GridComp remote: ../GEOSradiation_GridComp.git - tag: v1.11.0 + tag: v1.12.0 develop: develop RRTMGP: @@ -197,7 +233,7 @@ umwm: GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git - tag: v2.3.9 + tag: v2.3.10 develop: develop UMD_Etc: