From d2d90cd7e532385f2c2fcd38b9545edec8bf79e6 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 5 Sep 2024 10:23:36 -0400 Subject: [PATCH 1/7] 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 2/7] 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 3/7] 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 4/7] 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 5/7] 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 6/7] 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 7/7] 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: