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

Uptick to v10.19.4
GEOS-ESM · Oct 7, 2021 · c1626d1 · c1626d1
2 parents cccaeb7 + 072ab26
commit c1626d1
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,26 @@
 # Changelog
 
+## [10.19.4] - 2021-10-07
+
+### Zero-diff to previous release: YES for default AGCM, YES for OGCM for single moment MP
+### Restart Changes: NO
+
+Major 0-diff Changes:
+1. Restructuring under GEOSocean_GridComp by @yvikhlya in [#448](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/448)
+2. Updates to support two versions of Catchment-CN: Catchment-CN.4.0 and Catchment-CN.4.5 by @gmao-jkolassa in [#368](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/368)
+3. Compile time choice of CN model by @weiyuan-jiang in [#370](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/370)
+4. Runtime choice for clm4.0 and clm4.5 by @weiyuan-jiang in [#373](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/373)
+5. mk_GEOSldasRestart can now take restart hour and restart name by @weiyuan-jiang in [#449](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/449)
+6. Fixes to enable mepo variant styles by @tclune in [#334](https://github.com/GEOS-ESM/GEOSgcm/pull/334)
+7. Updates needed for Cascade Lake at NCCS by @mathomp4 in [#335](https://github.com/GEOS-ESM/GEOSgcm/pull/335)
+8. Updates and corrections for the trajectory file created for JEDI. Variables for proper diurnal layer, TS, and CO2 have been added by @rtodling in [#257](https://github.com/GEOS-ESM/GEOSgcm_App/pull/257)
+9. Null out WSUB_NATURE for 1MOM and GFDL physics by @mathomp4 in [#251](https://github.com/GEOS-ESM/GEOSgcm_App/pull/251)
+10. Cleanup gcm_run and sync forecast scripts by @sdrabenh in [#256](https://github.com/GEOS-ESM/GEOSgcm_App/pull/256)
+11. Fixes for SCM Setup on macOS by @mathomp4 in [#253](https://github.com/GEOS-ESM/GEOSgcm_App/pull/253)
+12. Updated suite of PRs for GEOSadas by @mathomp4 in [v1.4.10](https://github.com/GEOS-ESM/GMAO_Shared/releases/tag/v1.4.10)
+13. Bug fix for CICE4 segfault by @mathomp4 in [#215](https://github.com/GEOS-ESM/GMAO_Shared/pull/215)
+14. Add pyrob_CF script by @mathomp4 in [#208](https://github.com/GEOS-ESM/GMAO_Shared/pull/208)
+
 ## [10.19.3] - 2021-07-21
 
 ### Zero-diff to previous release: MOSTLY

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,7 +4,7 @@ cmake_policy (SET CMP0054 NEW)
 
 project (
   GEOSgcm
-  VERSION 10.19.3
+  VERSION 10.19.4
   LANGUAGES Fortran CXX C)  # Note - CXX is required for ESMF
 
 if ("${PROJECT_SOURCE_DIR}" STREQUAL "${PROJECT_BINARY_DIR}")

diff --git a/README.md b/README.md
@@ -21,9 +21,9 @@
 | [geos-chem](https://github.com/GEOS-ESM/geos-chem)                             | [geos/v13.0.0-rc1](https://github.com/GEOS-ESM/geos-chem/releases/tag/geos%2Fv13.0.0-rc1)           |
 | [GEOSchem_GridComp](https://github.com/GEOS-ESM/GEOSchem_GridComp)             | [v1.6.0](https://github.com/GEOS-ESM/GEOSchem_GridComp/releases/tag/v1.6.0)                         |
 | [GEOSgcm_App](https://github.com/GEOS-ESM/GEOSgcm_App)                         | [v1.5.5](https://github.com/GEOS-ESM/GEOSgcm_App/releases/tag/v1.5.5)                               |
-| [GEOSgcm_GridComp](https://github.com/GEOS-ESM/GEOSgcm_GridComp)               | [v1.12.5](https://github.com/GEOS-ESM/GEOSgcm_GridComp/releases/tag/v1.12.5)                        |
+| [GEOSgcm_GridComp](https://github.com/GEOS-ESM/GEOSgcm_GridComp)               | [v1.12.6](https://github.com/GEOS-ESM/GEOSgcm_GridComp/releases/tag/v1.12.6)                        |
 | [GFDL_atmos_cubed_sphere](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere) | [geos/v1.1.7](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere/releases/tag/geos%2Fv1.1.7)       |
-| [GMAO_Shared](https://github.com/GEOS-ESM/GMAO_Shared)                         | [v1.4.9](https://github.com/GEOS-ESM/GMAO_Shared/releases/tag/v1.4.9)                               |
+| [GMAO_Shared](https://github.com/GEOS-ESM/GMAO_Shared)                         | [v1.4.10](https://github.com/GEOS-ESM/GMAO_Shared/releases/tag/v1.4.10)                               |
 | [GOCART](https://github.com/GEOS-ESM/GOCART)                                   | [v1.0.1](https://github.com/GEOS-ESM/GOCART/releases/tag/v1.0.1)                                    |
 | [HEMCO](https://github.com/GEOS-ESM/HEMCO)                                     | [geos/v2.2.1](https://github.com/GEOS-ESM/HEMCO/releases/tag/geos%2Fv2.2.1)                         |
 | [MAPL](https://github.com/GEOS-ESM/MAPL)                                       | [v2.8.6](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.8.6)                                      |

diff --git a/components.yaml b/components.yaml
@@ -29,7 +29,7 @@ NCEP_Shared:
 GMAO_Shared:
   local: ./src/Shared/@GMAO_Shared
   remote: ../GMAO_Shared.git
-  tag: v1.4.9
+  tag: v1.4.10
   sparse: ./config/GMAO_Shared.sparse
   develop: main
 
@@ -48,7 +48,7 @@ FMS:
 GEOSgcm_GridComp:
   local: ./src/Components/@GEOSgcm_GridComp
   remote: ../GEOSgcm_GridComp.git
-  tag: v1.12.5
+  tag: v1.12.6
   sparse: ./config/GEOSgcm_GridComp.sparse
   develop: develop