From 45762688810557e7e011e5f7dd05c17bf291bfe1 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 23 Jul 2024 09:36:00 -0400 Subject: [PATCH 1/9] Update to ESMA_env v4.29.0, ESMA_cmake v3.46.0 --- README.md | 4 ++-- components.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 5d26a570..75047168 100644 --- a/README.md +++ b/README.md @@ -15,8 +15,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/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.46.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v3.46.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) | +| [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_env](https://github.com/GEOS-ESM/ESMA_env) | [v4.30.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v4.30.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.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 5b93ebe7..90a2a44f 100644 --- a/components.yaml +++ b/components.yaml @@ -5,13 +5,13 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v4.29.0 + tag: v4.30.0 develop: main cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v3.46.0 + tag: v3.48.0 develop: develop ecbuild: From 4d5f78cfebc2836eb2022394c8ce156d7e36b144 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 9 Sep 2024 10:23:47 -0400 Subject: [PATCH 2/9] Update to ESMA_env v4.30.1 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e9c2c84b..2e307621 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) | [v3.48.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v3.48.0) | -| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v4.30.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v4.30.0) | +| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v4.30.1](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v4.30.1) | | [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.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 08df7e54..4ce0a067 100644 --- a/components.yaml +++ b/components.yaml @@ -5,7 +5,7 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v4.30.0 + tag: v4.30.1 develop: main cmake: From 2dd5c1663992287aaaaefb1a1986391c95ffe39b Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 18 Sep 2024 11:07:36 -0400 Subject: [PATCH 3/9] Update to ESMA_env v4.31.1 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 70b8283e..42aa3cc0 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) | [v3.48.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v3.48.0) | -| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v4.30.1](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v4.30.1) | +| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v4.31.1](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v4.31.1) | | [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.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 9d0662f5..e1cf2025 100644 --- a/components.yaml +++ b/components.yaml @@ -5,7 +5,7 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v4.30.1 + tag: v4.31.1 develop: main cmake: From 36a259d00247c2057d7aaf14e2905e4c719f6628 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 22 Oct 2024 14:38:50 -0400 Subject: [PATCH 4/9] Update to Baselibs 7.27.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 18319215..c1fb0d74 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.4.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv1.4.0) | | [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v3.52.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v3.52.0) | -| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v4.31.1](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v4.31.1) | +| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v4.32.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v4.32.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) | diff --git a/components.yaml b/components.yaml index f2bfd2f9..7ff0aa9f 100644 --- a/components.yaml +++ b/components.yaml @@ -5,7 +5,7 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v4.31.1 + tag: v4.32.0 develop: main cmake: From 4c6a2435e9888b7e3af307270b2d14e660a6549a Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 13 Nov 2024 11:27:25 -0500 Subject: [PATCH 5/9] Update to ESMA_cmake v3.54.0 --- .circleci/config.yml | 6 +++--- .github/workflows/workflow.yml | 2 +- README.md | 2 +- components.yaml | 2 +- parallel_build.csh | 5 +++-- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 47851170..83af3624 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 v7.25.0 +baselibs_version: &baselibs_version v7.27.0 bcs_version: &bcs_version v11.6.0 tag_build_arg_name: &tag_build_arg_name gcmversion @@ -103,9 +103,9 @@ workflows: bcs_version: *bcs_version container_name: geosgcm mpi_name: openmpi - mpi_version: 5.0.2 + mpi_version: 5.0.5 compiler_name: gcc - compiler_version: 13.2.0 + compiler_version: 14.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 7d148d7f..4726d146 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-ifort_2021.13 + image: gmao/ubuntu20-geos-env:v7.27.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 9aaa7498..f65340de 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.4.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv1.4.0) | -| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v3.52.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v3.52.0) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v3.54.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v3.54.0) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v4.32.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v4.32.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) | diff --git a/components.yaml b/components.yaml index 3fd54195..2b824053 100644 --- a/components.yaml +++ b/components.yaml @@ -11,7 +11,7 @@ env: cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v3.52.0 + tag: v3.54.0 develop: develop ecbuild: diff --git a/parallel_build.csh b/parallel_build.csh index e32c2668..c8219d3b 100755 --- a/parallel_build.csh +++ b/parallel_build.csh @@ -35,6 +35,7 @@ if (-d ${ESMADIR}/@env || -d ${ESMADIR}/env@ || -d ${ESMADIR}/env) then echo "Checking out development branches of GEOSgcm_GridComp, GEOSgcm_App, GMAO_Shared, and GEOS_Util" mepo develop GEOSgcm_GridComp GEOSgcm_App GMAO_Shared GEOS_Util endif + mepo status else if ($?PBS_JOBID || $?SLURM_JOBID) then echo " mepo clone must be run!" @@ -42,13 +43,13 @@ else echo " Please run from a head node" exit 1 else - echo "Running mepo initialization" - mepo init + echo "Running mepo clone" mepo clone if ( "$DEVELOP" == "TRUE" ) then echo "Checking out development branches of GEOSgcm_GridComp, GEOSgcm_App, GMAO_Shared, and GEOS_Util" mepo develop GEOSgcm_GridComp GEOSgcm_App GMAO_Shared GEOS_Util endif + mepo status endif endif From a27b9175cfa14d1f3bc50fc3b849170a561668f0 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 2 Dec 2024 14:04:07 -0500 Subject: [PATCH 6/9] Update to ESMA_cmake v3.55.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f65340de..1bd714db 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.4.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv1.4.0) | -| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v3.54.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v3.54.0) | +| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v3.55.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v3.55.0) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v4.32.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v4.32.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) | diff --git a/components.yaml b/components.yaml index 2b824053..8ba10261 100644 --- a/components.yaml +++ b/components.yaml @@ -11,7 +11,7 @@ env: cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v3.54.0 + tag: v3.55.0 develop: develop ecbuild: From eb2ef90a1723495b81abb044f4f3dc1231a5ef30 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 2 Dec 2024 14:04:28 -0500 Subject: [PATCH 7/9] Update cmake minimum version to 3.24 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 25d7a70f..cb7a09fb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.23) +cmake_minimum_required (VERSION 3.24) cmake_policy (SET CMP0053 NEW) cmake_policy (SET CMP0054 NEW) From f8d7c96fbd01ba6e17ffb97a9691a88f2a9cabfe Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 6 Jan 2025 12:15:26 -0500 Subject: [PATCH 8/9] v11: Update to ESMA_env v4.33.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index cbc9d090..f525c11d 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.4.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv1.4.0) | | [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v3.55.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v3.55.0) | -| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v4.32.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v4.32.0) | +| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v4.33.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v4.33.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) | diff --git a/components.yaml b/components.yaml index 513ea93e..a9f1f3bb 100644 --- a/components.yaml +++ b/components.yaml @@ -5,7 +5,7 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v4.32.0 + tag: v4.33.0 develop: main cmake: From 1069d0c7e334b04c9a3a640b0a3a74182ae280a1 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 16 Jan 2025 12:01:05 -0500 Subject: [PATCH 9/9] Update to ESMA_env v4.34.0 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 61e49858..db8ec1db 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.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.33.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v4.33.0) | +| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v4.34.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v4.34.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) | diff --git a/components.yaml b/components.yaml index 8520141b..3e0a1ff8 100644 --- a/components.yaml +++ b/components.yaml @@ -5,7 +5,7 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v4.33.0 + tag: v4.34.0 develop: main cmake: