Merge branch 'main' into release/MAPL-v3

# Conflicts: # components.yaml
GEOS-ESM · Aug 24, 2023 · 368fa62 · 368fa62
2 parents a97996c + 25b9c26
commit 368fa62
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,37 @@
 
 ## Unreleased
 
+## [11.1.2] - 2023-08-24
+
+### Zero-diff to Previous Release: YES
+### Restart Changes: NO
+
+### Major Zero-Diff Changes:
+
+* Add GEOS-Chem washout parameterization to MOIST [#797](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/797)
+* Add data atmosphere for ocean [#799](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/799)
+* Move to `MAPL_GetResource` in Moist GC [#796](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/796)
+* Remove convert script and clean some dead variables [#504](https://github.com/GEOS-ESM/GEOSgcm_App/pull/504)
+* Add copy of `gwd_internal_rst` to SCM [#499](https://github.com/GEOS-ESM/GEOSgcm_App/pull/499)
+* Changes to better support singularity [#488](https://github.com/GEOS-ESM/GEOSgcm_App/pull/488)
+* Sensible defaults for stretched grid [#501](https://github.com/GEOS-ESM/GEOSgcm_App/pull/501)
+* Fixed the cmpz plots for rms and anomaly correlation [#31](https://github.com/GEOS-ESM/GEOS_Util/pull/31)
+* Eliminate accidental post-processing of `*.nc4-partial` files [#32](https://github.com/GEOS-ESM/GEOS_Util/pull/32)
+* Update `CircleCI` to use Orb Default Baselibs and BCs for multiple repositories
+* Fixture changes:
+   * ESMA_cmake  [v3.31.0 => v3.31.1](https://github.com/GEOS-ESM/ESMA_cmake/compare/v3.31.0...v3.31.1)
+   * GMAO_Shared  [v1.9.1 => v1.9.2](https://github.com/GEOS-ESM/GMAO_Shared/compare/v1.9.1...v1.9.2)
+   * GEOS_Util  [v2.0.2 => v2.0.3](https://github.com/GEOS-ESM/GEOS_Util/compare/v2.0.2...v2.0.3)
+   * MAPL  [v2.40.0 => v2.40.3](https://github.com/GEOS-ESM/MAPL/compare/v2.40.0...v2.40.3)
+   * GEOSgcm_GridComp  [v2.1.4 => v2.1.5](https://github.com/GEOS-ESM/GEOSgcm_GridComp/compare/v2.1.4...v2.1.5)
+   * FVdycoreCubed_GridComp  [v2.5.0 => v2.6.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/compare/v2.5.0...v2.6.0)
+   * GEOS_OceanGridComp  [v2.1.1 => v2.1.2](https://github.com/GEOS-ESM/GEOS_OceanGridComp/compare/v2.1.1...v2.1.2)
+   * MOM6  [geos/v2.2.0 => geos/v2.2.1](https://github.com/GEOS-ESM/MOM6/compare/geos/v2.2.0...geos/v2.2.1)
+   * icepack  [geos/v0.0.2 => geos/v0.0.3](https://github.com/GEOS-ESM/Icepack/compare/geos/v0.0.1...geos/v0.0.3)
+   * GEOSradiation_GridComp  [v1.4.0 => v1.5.1](https://github.com/GEOS-ESM/GEOSradiation_GridComp/compare/v1.4.0...v1.5.1)
+   * GEOSgcm_App  [v2.2.1 => v2.2.2](https://github.com/GEOS-ESM/GEOSgcm_App/compare/v2.2.1...v2.2.2)
+
+
 ## [11.1.1] - 2023-07-28
 
 ### Zero-diff to Previous Release: YES

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,7 +4,7 @@ cmake_policy (SET CMP0054 NEW)
 
 project (
   GEOSgcm
-  VERSION 11.1.1
+  VERSION 11.1.2
   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,14 +21,14 @@
 | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp)   | [v2.6.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.6.0)                    |
 | [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)           |
 | [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp)           | [v2.1.2](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v2.1.2)                        |
-| [GEOS_Util](https://github.com/GEOS-ESM/GEOS_Util)                             | [v2.0.2](https://github.com/GEOS-ESM/GEOS_Util/releases/tag/v2.0.2)                                 |
+| [GEOS_Util](https://github.com/GEOS-ESM/GEOS_Util)                             | [v2.0.3](https://github.com/GEOS-ESM/GEOS_Util/releases/tag/v2.0.3)                                 |
 | [GEOSchem_GridComp](https://github.com/GEOS-ESM/GEOSchem_GridComp)             | [v1.12.2](https://github.com/GEOS-ESM/GEOSchem_GridComp/releases/tag/v1.12.2)                       |
-| [GEOSgcm_App](https://github.com/GEOS-ESM/GEOSgcm_App)                         | [v2.2.1](https://github.com/GEOS-ESM/GEOSgcm_App/releases/tag/v2.2.1)                               |
-| [GEOSgcm_GridComp](https://github.com/GEOS-ESM/GEOSgcm_GridComp)               | [v2.1.4](https://github.com/GEOS-ESM/GEOSgcm_GridComp/releases/tag/v2.1.4)                          |
+| [GEOSgcm_App](https://github.com/GEOS-ESM/GEOSgcm_App)                         | [v2.2.2](https://github.com/GEOS-ESM/GEOSgcm_App/releases/tag/v2.2.2)                               |
+| [GEOSgcm_GridComp](https://github.com/GEOS-ESM/GEOSgcm_GridComp)               | [v2.1.5](https://github.com/GEOS-ESM/GEOSgcm_GridComp/releases/tag/v2.1.5)                          |
 | [GEOSradiation_GridComp](https://github.com/GEOS-ESM/GEOSradiation_GridComp)   | [v1.5.1](https://github.com/GEOS-ESM/GEOSradiation_GridComp/releases/tag/v1.5.1)                    |
 | [GFDL_atmos_cubed_sphere](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere) | [geos/v2.4.1](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere/releases/tag/geos%2Fv2.4.1)       |
 | [GMI](https://github.com/GEOS-ESM/GMI)                                         | [v1.0.0](https://github.com/GEOS-ESM/GMI/releases/tag/v1.0.0)                                       |
-| [GMAO_Shared](https://github.com/GEOS-ESM/GMAO_Shared)                         | [v1.9.1](https://github.com/GEOS-ESM/GMAO_Shared/releases/tag/v1.9.1)                               |
+| [GMAO_Shared](https://github.com/GEOS-ESM/GMAO_Shared)                         | [v1.9.2](https://github.com/GEOS-ESM/GMAO_Shared/releases/tag/v1.9.2)                               |
 | [GOCART](https://github.com/GEOS-ESM/GOCART)                                   | [sdr_v2.1.2.7](https://github.com/GEOS-ESM/GOCART/releases/tag/sdr_v2.1.2.7)                        |
 | [HEMCO](https://github.com/GEOS-ESM/HEMCO)                                     | [geos/v2.2.3](https://github.com/GEOS-ESM/HEMCO/releases/tag/geos%2Fv2.2.3)                         |
 | [Icepack](https://github.com/GEOS-ESM/Icepack)                                 | [geos/v0.0.3](https://github.com/GEOS-ESM/Icepack/releases/tag/geos%2Fv0.0.3)                       |

diff --git a/components.yaml b/components.yaml
@@ -29,14 +29,14 @@ NCEP_Shared:
 GMAO_Shared:
   local: ./src/Shared/@GMAO_Shared
   remote: ../GMAO_Shared.git
-  tag: v1.9.1
+  tag: v1.9.2
   sparse: ./config/GMAO_Shared.sparse
   develop: main
 
 GEOS_Util:
   local: ./src/Shared/@GMAO_Shared/@GEOS_Util
   remote: ../GEOS_Util.git
-  tag: v2.0.2
+  tag: v2.0.3
   develop: main
 
 MAPL: