From 6fb2fa8e8eee4d76b12a858212736cb4eddd1769 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 8 Jun 2023 11:42:03 -0400 Subject: [PATCH 1/7] Update components to match GEOSgcm v11.1.0, update CI This PR updates the "in-repo" components to match GEOSgcm v11.1.0. This is mainly used for build testing of GOCART without the full model. This PR also updates the CI to point to Baselibs 7.13.0 which is the version used by GEOSgcm v11.1.0. --- .circleci/config.yml | 2 +- components.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c3925282..e22a79cb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ version: 2.1 # Anchors to prevent forgetting to update a version -baselibs_version: &baselibs_version v7.7.0 +baselibs_version: &baselibs_version v7.13.0 bcs_version: &bcs_version v11.00.0 orbs: diff --git a/components.yaml b/components.yaml index 81aa3128..ef6d13e1 100644 --- a/components.yaml +++ b/components.yaml @@ -5,13 +5,13 @@ GOCART: env: local: ./env@ remote: ../ESMA_env.git - tag: v4.9.1 + tag: v4.17.0 develop: main cmake: local: ./cmake@ remote: ../ESMA_cmake.git - tag: v3.28.0 + tag: v3.29.0 develop: develop ecbuild: @@ -28,12 +28,12 @@ HEMCO: GMAO_Shared: local: ./ESMF/Shared/GMAO_Shared@ remote: ../GMAO_Shared.git - tag: v1.9.0 + tag: v1.9.1 sparse: ./config/GMAO_Shared.sparse develop: main MAPL: local: ./ESMF/Shared/MAPL@ remote: ../MAPL.git - tag: v2.38.1 + tag: v2.39.1 develop: develop From ebe4aafcd26e85926a79a708d02ddac99284f43b Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 8 Jun 2023 11:46:27 -0400 Subject: [PATCH 2/7] Update changelog --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 25023cc6..2e90bab5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed +- Update `components.yaml` to match that of GEOSgcm v11.1.0 + - ESMA_env v4.17.0 (Baselibs 7.13.0) + - ESMA_cmake v3.29.0 (Fixes for NAS) + - GMAO_Shared v1.9.1 (Bug fix for MITgcm) + - MAPL 2.39.1 (Various minor fixes and features) +- Update CI to use Baselibs 7.13.0 + ## [v2.2.1] - 2023-05-30 ### Fixed From 4c227fb0783637c4930bfc01550a535bb6cc3efa Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 31 Jul 2023 11:55:20 -0400 Subject: [PATCH 3/7] Update components to match GEOSgcm v11.1.1 --- .circleci/config.yml | 12 ++++++------ CHANGELOG.md | 10 +++++----- components.yaml | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e22a79cb..acce258d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,8 +1,8 @@ version: 2.1 -# Anchors to prevent forgetting to update a version -baselibs_version: &baselibs_version v7.13.0 -bcs_version: &bcs_version v11.00.0 +# Anchors in case we need to override the defaults from the orb +#baselibs_version: &baselibs_version v7.14.0 +#bcs_version: &bcs_version v11.1.0 orbs: ci: geos-esm/circleci-tools@1 @@ -18,7 +18,7 @@ workflows: matrix: parameters: compiler: [gfortran, ifort] - baselibs_version: *baselibs_version + #baselibs_version: *baselibs_version repo: GOCART buildtarget: GOCART2G_GridComp mepodevelop: true @@ -32,7 +32,7 @@ workflows: matrix: parameters: compiler: [gfortran, ifort] - baselibs_version: *baselibs_version + #baselibs_version: *baselibs_version repo: GOCART buildtarget: GOCART2G_GridComp mepodevelop: true @@ -47,7 +47,7 @@ workflows: matrix: parameters: compiler: [gfortran, ifort] - baselibs_version: *baselibs_version + #baselibs_version: *baselibs_version repo: GEOSgcm checkout_fixture: true mepodevelop: true diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e90bab5..56ecca45 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,12 +13,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed -- Update `components.yaml` to match that of GEOSgcm v11.1.0 - - ESMA_env v4.17.0 (Baselibs 7.13.0) - - ESMA_cmake v3.29.0 (Fixes for NAS) +- Update `components.yaml` to match that of GEOSgcm v11.1.1 + - ESMA_env v4.19.0 (Baselibs 7.14.0) + - ESMA_cmake v3.31.0 (Fixes for NAS, debug flags) - GMAO_Shared v1.9.1 (Bug fix for MITgcm) - - MAPL 2.39.1 (Various minor fixes and features) -- Update CI to use Baselibs 7.13.0 + - MAPL 2.40.1 (Various fixes and features) +- Update CI to use Baselibs by default from CircleCI Orb ## [v2.2.1] - 2023-05-30 diff --git a/components.yaml b/components.yaml index ef6d13e1..37c286fe 100644 --- a/components.yaml +++ b/components.yaml @@ -5,13 +5,13 @@ GOCART: env: local: ./env@ remote: ../ESMA_env.git - tag: v4.17.0 + tag: v4.19.0 develop: main cmake: local: ./cmake@ remote: ../ESMA_cmake.git - tag: v3.29.0 + tag: v3.31.0 develop: develop ecbuild: @@ -35,5 +35,5 @@ GMAO_Shared: MAPL: local: ./ESMF/Shared/MAPL@ remote: ../MAPL.git - tag: v2.39.1 + tag: v2.40.0 develop: develop From 1bba2142ef6cef1aef7d6b75995cc8153df4866c Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 19 Sep 2023 10:09:36 -0400 Subject: [PATCH 4/7] Update CMakeLists.txt --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b20e22c..f8c78baa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_policy (SET CMP0054 NEW) project ( GOCART - VERSION 2.1.1 + VERSION 2.2.1 LANGUAGES Fortran CXX C) # Note - CXX is required for ESMF if ("${PROJECT_SOURCE_DIR}" STREQUAL "${PROJECT_BINARY_DIR}") From 9c42809dd09b860b689dbe1c86a5907d9f947c76 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 25 Sep 2023 12:20:50 -0400 Subject: [PATCH 5/7] Update to v11.2.0 components --- CHANGELOG.md | 8 ++++---- components.yaml | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 56ecca45..4792be98 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,11 +13,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed -- Update `components.yaml` to match that of GEOSgcm v11.1.1 +- Update `components.yaml` to match that of GEOSgcm v11.2.0 - ESMA_env v4.19.0 (Baselibs 7.14.0) - - ESMA_cmake v3.31.0 (Fixes for NAS, debug flags) - - GMAO_Shared v1.9.1 (Bug fix for MITgcm) - - MAPL 2.40.1 (Various fixes and features) + - ESMA_cmake v3.31.1 (Fixes for NAS, debug flags) + - GMAO_Shared v1.9.2 (Bug fix for MITgcm, CI fixes) + - MAPL 2.40.3 (Various fixes and features) - Update CI to use Baselibs by default from CircleCI Orb ## [v2.2.1] - 2023-05-30 diff --git a/components.yaml b/components.yaml index 37c286fe..f0295031 100644 --- a/components.yaml +++ b/components.yaml @@ -11,7 +11,7 @@ env: cmake: local: ./cmake@ remote: ../ESMA_cmake.git - tag: v3.31.0 + tag: v3.31.1 develop: develop ecbuild: @@ -28,12 +28,12 @@ HEMCO: GMAO_Shared: local: ./ESMF/Shared/GMAO_Shared@ remote: ../GMAO_Shared.git - tag: v1.9.1 + tag: v1.9.2 sparse: ./config/GMAO_Shared.sparse develop: main MAPL: local: ./ESMF/Shared/MAPL@ remote: ../MAPL.git - tag: v2.40.0 + tag: v2.40.3 develop: develop From f84a6dc93e2b9aecaa17dd19245f0889e772c2c7 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 1 Dec 2023 08:22:44 -0500 Subject: [PATCH 6/7] update to match v11.3.3 --- CHANGELOG.md | 10 +++++----- components.yaml | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e035da0a..a0d92907 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,11 +18,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed -- Update `components.yaml` to match that of GEOSgcm v11.2.0 - - ESMA_env v4.19.0 (Baselibs 7.14.0) - - ESMA_cmake v3.31.1 (Fixes for NAS, debug flags) - - GMAO_Shared v1.9.2 (Bug fix for MITgcm, CI fixes) - - MAPL 2.40.3 (Various fixes and features) +- Update `components.yaml` to match that of GEOSgcm v11.3.3 + - ESMA_env v4.20.6 (Baselibs 7.14.0, Updates for SLES15 at NCCS) + - ESMA_cmake v3.36.0 (Fixes for NAS, debug flags, Updates for SLES15 at NCCS) + - GMAO_Shared v1.9.6 (Bug fix for MITgcm, CI fixes, SLES15 Updates) + - MAPL 2.42.0 (Various fixes and features) - Update CI to use Baselibs by default from CircleCI Orb - Correct soil moisture parameterization in FENGSHA - Add `soil_moisture_factor` to the DU2G_instance_DU.rc (same name used in the K14 scheme) and DU2G_GridCompMod.F90 files for FENGSHA diff --git a/components.yaml b/components.yaml index f0295031..8b169a7b 100644 --- a/components.yaml +++ b/components.yaml @@ -5,13 +5,13 @@ GOCART: env: local: ./env@ remote: ../ESMA_env.git - tag: v4.19.0 + tag: v4.20.6 develop: main cmake: local: ./cmake@ remote: ../ESMA_cmake.git - tag: v3.31.1 + tag: v3.36.0 develop: develop ecbuild: @@ -28,12 +28,12 @@ HEMCO: GMAO_Shared: local: ./ESMF/Shared/GMAO_Shared@ remote: ../GMAO_Shared.git - tag: v1.9.2 + tag: v1.9.6 sparse: ./config/GMAO_Shared.sparse develop: main MAPL: local: ./ESMF/Shared/MAPL@ remote: ../MAPL.git - tag: v2.40.3 + tag: v2.42.0 develop: develop From 0cd37e5845d248daf57953cce935f2145bfaf14f Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 22 Jan 2024 14:04:43 -0500 Subject: [PATCH 7/7] Update CI and components --- .circleci/config.yml | 6 +++--- components.yaml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index acce258d..9f25aed2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,11 +1,11 @@ version: 2.1 # Anchors in case we need to override the defaults from the orb -#baselibs_version: &baselibs_version v7.14.0 -#bcs_version: &bcs_version v11.1.0 +#baselibs_version: &baselibs_version v7.17.0 +#bcs_version: &bcs_version v11.3.0 orbs: - ci: geos-esm/circleci-tools@1 + ci: geos-esm/circleci-tools@2 workflows: build-and-test: diff --git a/components.yaml b/components.yaml index 8b169a7b..faf25a7d 100644 --- a/components.yaml +++ b/components.yaml @@ -5,7 +5,7 @@ GOCART: env: local: ./env@ remote: ../ESMA_env.git - tag: v4.20.6 + tag: v4.24.0 develop: main cmake: @@ -35,5 +35,5 @@ GMAO_Shared: MAPL: local: ./ESMF/Shared/MAPL@ remote: ../MAPL.git - tag: v2.42.0 + tag: v2.43.0 develop: develop