Merge pull request #138 from GEOS-ESM/sdrabenh-uptick-gcm

Update components

CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## [10.12.2] - 2020-04-16
+
+### Zero-diff to previous release: YES
+
+### Restart Changes: NO except moist_import has an additional field: FRACI
+
+Major changes are:
+
+1. Added connectivity from MOIST to CHEM for 2 fields (RI and RL).
+2. Updates to the obio component which was in the CVS Icarus-2.0 tag.
+3. Bugfix for coupled mode renaming TSKINI to TSKINICE.
+4. Bugfix for DTDT_moist which was initially set to temperature but never updated to provide tendency.
+5. Compute the lightning flash rate (LFR) online following the approach used by GEOSCHEMchem_GridComp. The LFR is calculated in MOIST and then made available to other components as a new export field (LFR_GCC).
+6. Modified the mk_Restarts script to run on SLES-12.
+7. Update RRTMGP to Pincus 2020-Feb-12.
+8. New Surface parameter resource file (GEOSsurface_GridComp/Shared/GEOS_SurfaceGridComp.rc) to avoid having to add new parameters into AGCM.rc.tmpl and prepare for further science development.
+9. Correcting the following issues with the single column model: (1) GF imports from DYN were not filled; (2) scm_setup incompletely adjusted for L132; (3) SST file for cfmip_s11 case was incorrect.
+10. Allows regrid.pl to run on SLES-12
+11. Enabled compilation of convert_aerosols.x as R8
+
 ## [10.12.1] - 2020-03-27
 
 ### Zero-diff to previous release: YES

CMakeLists.txt

@@ -4,7 +4,7 @@ cmake_policy (SET CMP0054 NEW)
 
 project (
   GEOSgcm
-  VERSION 10.12.1
+  VERSION 10.12.2
   LANGUAGES Fortran CXX C)  # Note - CXX is required for ESMF
 
 if ("${PROJECT_SOURCE_DIR}" STREQUAL "${PROJECT_BINARY_DIR}")

Develop.cfg

@@ -9,7 +9,7 @@ protocol = git
 required = True
 repo_url = [email protected]:GEOS-ESM/ESMA_cmake.git
 local_path = ./@cmake
-tag = v2.2.1
+tag = v2.2.2
 externals = Externals.cfg
 protocol = git
 
@@ -40,7 +40,7 @@ protocol = git
 required = True
 repo_url = [email protected]:GEOS-ESM/MAPL.git
 local_path = ./src/Shared/@MAPL
-tag = v2.0.5
+tag = v2.0.6
 protocol = git
 
 [FMS]

Externals.cfg

@@ -9,7 +9,7 @@ protocol = git
 required = True
 repo_url = [email protected]:GEOS-ESM/ESMA_cmake.git
 local_path = ./@cmake
-tag = v2.2.1
+tag = v2.2.2
 externals = Externals.cfg
 protocol = git
 
@@ -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.1.2
+tag = v1.1.3
 protocol = git
 sparse = ../../../config/GMAO_Shared.sparse
 
@@ -40,7 +40,7 @@ protocol = git
 required = True
 repo_url = [email protected]:GEOS-ESM/MAPL.git
 local_path = ./src/Shared/@MAPL
-tag = v2.0.5
+tag = v2.0.6
 protocol = git
 
 [FMS]
@@ -54,7 +54,7 @@ protocol = git
 required = True
 repo_url = [email protected]:GEOS-ESM/GEOSgcm_GridComp.git
 local_path = ./src/Components/@GEOSgcm_GridComp
-tag = v1.8.2
+tag = v1.8.3
 protocol = git
 externals = Externals.cfg
 

components.yaml

@@ -7,7 +7,7 @@ env:
 cmake:
   local: ./@cmake
   remote: ../ESMA_cmake.git
-  tag: v2.2.1
+  tag: v2.2.2
   develop: develop
 
 ecbuild:
@@ -37,7 +37,7 @@ GSW-Fortran:
 MAPL:
   local: ./src/Shared/@MAPL
   remote: ../MAPL.git
-  tag: v2.0.5
+  tag: v2.0.6
   develop: develop
 
 FMS:
@@ -49,7 +49,7 @@ FMS:
 GEOSgcm_GridComp:
   local: ./src/Components/@GEOSgcm_GridComp
   remote: ../GEOSgcm_GridComp.git
-  tag: v1.8.2
+  tag: v1.8.3
   develop: develop
 
 FVdycoreCubed_GridComp: