Merge pull request #259 from GEOS-ESM/develop

Add support for GMI/GOCART2G coupling; new wrapper for MAPL SZA

CHANGELOG.md

@@ -13,6 +13,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 ### Fixed
 
+## [1.13.1] - 2023-04-24
+
+### Added
+
+- Added CO2 connectivity in GEOS_ChemGridComp for GOCART-GEOS-Chem coupling
+- Added a wrapper routine for the MAPL Solar Zenith Angle call, in Chem_Shared
+- Added connectivity from GOCART2G aerosols to GMI chem
+
+### Removed
+
+- Removed the GMI routines which computed Solar Zenith Angle, in Chem_Shared; but in a later commit, this was added back temporarily, so that older versions of GMI and TR don't complain.
+
+- Removed parallel read of PChem species file. This parallel read was causing issues at NAS at large node count, so now we just do a read-on-root followed by a broadcast
+
+### Fixed
+
+- Fixed a bug that had prevented GMI running with HEMCO
+
 ## [1.13.0] - 2023-03-01
 
 ### Added

GEOS_ChemGridComp.F90

@@ -650,6 +650,18 @@ subroutine SetServices ( GC, RC )
 
   END IF
 
+! GOCART2G <=> GMICHEM coupling ...
+! ---------------------------------
+  IF(myState%enable_GMICHEM .AND. TRIM(providerName) == "GOCART2G") THEN
+
+   IF(myState%enable_GOCART2G) &
+
+    CALL MAPL_AddConnectivity ( GC, &
+         SHORT_NAME  = (/'AERO'/),                &
+         DST_ID = GMICHEM, SRC_ID = GOCART2G, __RC__  )
+
+  END IF
+
 ! GOCART.data <=> GMICHEM coupling ...
 ! ------------------------------------
   IF(myState%enable_GMICHEM .AND. TRIM(providerName) == "GOCART.data") THEN
@@ -772,6 +784,15 @@ subroutine SetServices ( GC, RC )
    ENDIF
   ENDIF
 
+! GEOS-Chem import of CO2 
+! -----------------------------
+  IF(myState%enable_GEOSCHEM .AND. myState%enable_GOCART .AND. chemReg%doing_CO2) then
+   CALL MAPL_AddConnectivity ( GC, &
+       SRC_NAME  = (/"GOCART::CO2"/), &
+       DST_NAME  = (/"GOCART_CO2"/), &
+       DST_ID=GEOSCHEM, SRC_ID=GOCART, __RC__  )
+  ENDIF
+
 ! HEMCO connections to CHEMENV
 ! -----------------------------
   ! Default values:
@@ -857,8 +878,8 @@ subroutine SetServices ( GC, RC )
      END IF
 
      ! make sure we don't have inconsistent MEGAN flags
-     IF ( doMEGANviaHEMCO .eqv. .TRUE.    .AND.  &
-          doMEGANemission .eqv. .FALSE. ) THEN
+     IF ( ( doMEGANviaHEMCO .eqv. .TRUE. )    .AND.  &
+          ( doMEGANemission .eqv. .FALSE. ) ) THEN
         PRINT*,'Inconsistent GMI flags: doMEGANviaHEMCO==T, doMEGANemission==F'
         STATUS=99
         VERIFY_(STATUS)