From 7361138fdd69902f322b05f97c4694154109ed1e Mon Sep 17 00:00:00 2001 From: Mike Manyin Date: Tue, 23 May 2023 11:17:56 -0400 Subject: [PATCH 1/4] Add connectivity from GMI to ACHEM (4 fields) --- GEOS_ChemGridComp.F90 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/GEOS_ChemGridComp.F90 b/GEOS_ChemGridComp.F90 index 658fa23..010641d 100644 --- a/GEOS_ChemGridComp.F90 +++ b/GEOS_ChemGridComp.F90 @@ -604,6 +604,13 @@ subroutine SetServices ( GC, RC ) DST_NAME = (/'O3P ', 'OHSTRAT ', 'O3 ', 'OCS_JRATE'/), & DST_ID = ACHEM, SRC_ID = STRATCHEM, __RC__ ) ENDIF + + IF(myState%enable_GMICHEM .AND. myState%enable_ACHEM) then + CALL MAPL_AddConnectivity ( GC, & + SRC_NAME = (/'O ', 'OH ', 'OX ', 'OCS_JRATE'/), & + DST_NAME = (/'O3P ', 'OHSTRAT ', 'O3 ', 'OCS_JRATE'/), & + DST_ID = ACHEM, SRC_ID = GMICHEM, __RC__ ) + ENDIF ! GOCART <=> ACHEM (OCS CHEMISTRY) From f45dd360116c6450bd524c333804bc652615d957 Mon Sep 17 00:00:00 2001 From: Mike Manyin Date: Tue, 23 May 2023 13:36:46 -0400 Subject: [PATCH 2/4] edit CHANGELOG --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba5769c..a5a1b27 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,8 +9,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ### Added + +- Connectivity from GMI to ACHEM (4 fields) + ### Removed + ### Changed + ### Fixed ## [1.13.1] - 2023-04-24 From 6108c8e852cd726c8b2e8c4b97b7689acf39d725 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 8 Jun 2023 11:58:35 -0400 Subject: [PATCH 3/4] Update CI to use Baselibs 7.13.0 This PR updates the CI to point to Baselibs 7.13.0 which is the version used by GEOSgcm on `main` --- .circleci/config.yml | 4 ++-- CHANGELOG.md | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index db67635..bb1a2b1 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.7.0 -bcs_version: &bcs_version v10.22.3 +baselibs_version: &baselibs_version v7.13.0 +bcs_version: &bcs_version v11.00.0 orbs: ci: geos-esm/circleci-tools@1 diff --git a/CHANGELOG.md b/CHANGELOG.md index a5a1b27..602cfb1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed +- Update CI to use Baselibs 7.13.0 + ### Fixed ## [1.13.1] - 2023-04-24 From 8636eb8108e171892daba6f418346abc570559fd Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 12 Jul 2023 15:26:56 -0400 Subject: [PATCH 4/4] Fix ESMF_VMGet call in GAAS --- CHANGELOG.md | 2 ++ GAAS_GridComp/LDE_Mod.F90 | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 602cfb1..4b172e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed +- Fix a bug in GAAS where it gets the VM (global instead of the correct current) + ## [1.13.1] - 2023-04-24 ### Added diff --git a/GAAS_GridComp/LDE_Mod.F90 b/GAAS_GridComp/LDE_Mod.F90 index e5d7f32..fd15f50 100644 --- a/GAAS_GridComp/LDE_Mod.F90 +++ b/GAAS_GridComp/LDE_Mod.F90 @@ -130,7 +130,7 @@ subroutine LDE_Create ( self, CF, Grid, rc ) ! Get VM for later ! ---------------- - call ESMF_VMGetGlobal(self%VM,__RC__) + call ESMF_VMGetCurrent(self%VM,__RC__) ! Set Ensemble indices on root PE ! -------------------------------