Merge branch 'develop' into feature/mathomp4/separate-dna-mam-matrix

# Conflicts:
#	CHANGELOG.md
#	GAAS_GridComp/LDE_Mod.F90
#	GEOS_ChemGridComp.F90

.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

CHANGELOG.md

@@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ### Added
+
+- Connectivity from GMI to ACHEM (4 fields)
+
 ### Removed
 
 - Removed `MAMchem_GridComp`, `MATRIXchem_GridComp`, `DNA_GridComp`, `CARMAchem_GridComp`, `GAAS_GridComp`, and `GEOSachem_GridComp` as these are now in separate repos
@@ -20,8 +23,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
    - `GEOSachem_GridComp` → [GEOSachem](https://github.com/GEOS-ESM/GEOSachem)
 
 ### Changed
+
+- Update CI to use Baselibs 7.13.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

GEOS_ChemGridComp.F90

@@ -605,6 +605,13 @@ subroutine SetServices ( GC, RC )
         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)
 ! ---------------------------------