Merge pull request #97 from GEOS-ESM/sdrabenh-patch-1

Sync develop into master

CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [10.6.0] - 2020-01-31
+
+### Zero-diff to previous release: NO
+
+### Restart Changes: NO
+
+1. Atmospheric constituents (aersols, co, co2, etc) are now transported through moist/GF. This is equivalent to the way transport is handled in f525land_fpp/f525_fp.
+2. Added exports for nitrate tendency and other fluxes related to GF convection.
+3. Added nitrate tendency to history templates.
+4. Upgraded to GEOSchem_GridComp to v1.1.0.
+5. Set the default k_split = 2.
+6. Fixed gcm_convert.j to work consistent with how gcm_setup and gcm_run.j interact.
+
 ## [10.5.0] - 2020-01-24
 
 ### Zero-diff to previous release: YES (but user must setup experiment differently)

Externals.cfg

@@ -25,7 +25,7 @@ sparse = ../../../config/NCEP_Shared.sparse
 required = True
 repo_url = [email protected]:GEOS-ESM/GMAO_Shared.git
 local_path = ./src/Shared/@GMAO_Shared
-tag = v1.0.15
+tag = v1.0.16
 protocol = git
 sparse = ../../../config/GMAO_Shared.sparse
 
@@ -54,15 +54,15 @@ protocol = git
 required = True
 repo_url = [email protected]:GEOS-ESM/GEOSgcm_GridComp.git
 local_path = ./src/Components/@GEOSgcm_GridComp
-tag = v1.2.0
+tag = v1.3.0
 protocol = git
 externals = Externals.cfg
 
 [GEOSgcm_App]
 required = True
 repo_url = [email protected]:GEOS-ESM/GEOSgcm_App.git
 local_path = ./src/Applications/@GEOSgcm_App
-tag = v1.1.0
+tag = v1.2.0
 protocol = git
 
 [UMD_Etc]

components.yaml

@@ -49,7 +49,7 @@ FMS:
 GEOSgcm_GridComp:
   local: ./src/Components/@GEOSgcm_GridComp
   remote: [email protected]:GEOS-ESM/GEOSgcm_GridComp.git
-  tag: v1.2.0
+  tag: v1.3.0
   develop: develop
 
 FVdycoreCubed_GridComp:
@@ -67,7 +67,7 @@ fvdycore:
 GEOSchem_GridComp:
   local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp
   remote: [email protected]:GEOS-ESM/GEOSchem_GridComp.git
-  tag: v1.0.6
+  tag: v1.1.0
   develop: develop
 
 mom:
@@ -79,7 +79,7 @@ mom:
 GEOSgcm_App:
   local: ./src/Applications/@GEOSgcm_App
   remote: [email protected]:GEOS-ESM/GEOSgcm_App.git
-  tag: v1.1.0
+  tag: v1.2.0
   develop: develop
 
 UMD_Etc: