From de5d2884e1ca2849c46c83c654278ccb28a3710d Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 5 Jul 2022 10:43:05 -0400 Subject: [PATCH 1/3] Update to MAPL 2.23.0 --- .circleci/config.yml | 11 ++++++++--- .github/workflows/workflow.yml | 2 +- README.md | 6 +++--- components.yaml | 6 +++--- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 076b2330..4c8d67da 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,5 +1,9 @@ version: 2.1 +# Anchors to prevent forgetting to update a version +baselibs_version: &baselibs_version v7.5.0 +bcs_version: &bcs_version v10.22.3 + orbs: ci: geos-esm/circleci-tools@1 @@ -12,9 +16,8 @@ workflows: - docker-hub-creds matrix: parameters: - compiler: - - gfortran - - ifort + compiler: [ifort, gfortran] + baselibs_version: *baselibs_version repo: GEOSgcm persist_workspace: false # Needs to be true to run fv3/gcm experiment, costs extra ################################################## @@ -25,6 +28,8 @@ workflows: # matrix: # # parameters: # # compiler: [gfortran, ifort] # + # baselibs_version: *baselibs_version # + # bcs_version: *bcs_version # # requires: # # - build-GEOSgcm-on-<< matrix.compiler >> # # repo: GEOSgcm # diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 84de743d..99d659c4 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-mkl:v6.2.13-openmpi_4.1.2-gcc_11.2.0 + image: gmao/ubuntu20-geos-env-mkl:v7.5.0-openmpi_4.1.2-gcc_11.2.0 credentials: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} diff --git a/README.md b/README.md index 862bbd99..7a20ba56 100644 --- a/README.md +++ b/README.md @@ -15,8 +15,8 @@ | [CICE](https://github.com/GEOS-ESM/CICE) | [geos/v0.0.1](https://github.com/GEOS-ESM/CICE/releases/tag/geos%2Fv0.0.1) | | [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.2.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv1.2.0) | -| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v3.16.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v3.16.0) | -| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v3.13.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v3.13.0) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v3.17.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v3.17.0) | +| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v4.2.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v4.2.0) | | [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) | [v1.8.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v1.8.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) | @@ -28,7 +28,7 @@ | [GMAO_Shared](https://github.com/GEOS-ESM/GMAO_Shared) | [v1.5.5](https://github.com/GEOS-ESM/GMAO_Shared/releases/tag/v1.5.5) | | [GOCART](https://github.com/GEOS-ESM/GOCART) | [v2.0.7](https://github.com/GEOS-ESM/GOCART/releases/tag/v2.0.7) | | [HEMCO](https://github.com/GEOS-ESM/HEMCO) | [geos/v2.2.3](https://github.com/GEOS-ESM/HEMCO/releases/tag/geos%2Fv2.2.3) | -| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.21.3](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.21.3) | +| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.23.0](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.23.0) | | [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/v2.0.3](https://github.com/GEOS-ESM/MOM6/releases/tag/geos%2Fv2.0.3) | | [NCEP_Shared](https://github.com/GEOS-ESM/NCEP_Shared) | [v1.2.0](https://github.com/GEOS-ESM/NCEP_Shared/releases/tag/v1.2.0) | diff --git a/components.yaml b/components.yaml index 1325ef8d..d0e578d6 100644 --- a/components.yaml +++ b/components.yaml @@ -5,13 +5,13 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v3.13.0 + tag: v4.2.0 develop: main cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v3.16.0 + tag: v3.17.0 develop: develop ecbuild: @@ -36,7 +36,7 @@ GMAO_Shared: MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - tag: v2.21.3 + branch: feature/bmauer/check_parasing_yaml_extdata2g develop: develop FMS: From 6f5d2446f5bcbca958eb84af25113e061408167d Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 6 Jul 2022 08:22:10 -0400 Subject: [PATCH 2/3] Move to develop as MAPL branch was merged --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index d0e578d6..c68febb7 100644 --- a/components.yaml +++ b/components.yaml @@ -36,7 +36,7 @@ GMAO_Shared: MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - branch: feature/bmauer/check_parasing_yaml_extdata2g + branch: develop develop: develop FMS: From bb856249e2446682580ed7843e4751b3fb15da62 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 6 Jul 2022 09:54:49 -0400 Subject: [PATCH 3/3] Update components to use MAPL 2.23.0 tag --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index c68febb7..5e6ea47d 100644 --- a/components.yaml +++ b/components.yaml @@ -36,7 +36,7 @@ GMAO_Shared: MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - branch: develop + tag: v2.23.0 develop: develop FMS: