Merge branch 'main' into release/MAPL-v3

# Conflicts:
#	components.yaml

CHANGELOG.md

@@ -2,6 +2,30 @@
 
 ## Unreleased
 
+## [11.3.1] - 2023-10-20
+
+### Zero-diff to Previous Release: YES
+### Restart Changes: NO
+
+### Major Zero-Diff Changes:
+* Updates for SCU17 [#669](https://github.com/GEOS-ESM/GEOSgcm/pull/669)
+* Patched GF2020: reverting order of plumes and allowing plume overlap and consistent autoconversion with classic GF [#838](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/838)
+* Enable `FV3_CONFIG: HWT` for NH runs, `CONVPAR_OPTION: NONE` for ultra-high-res [#521](https://github.com/GEOS-ESM/GEOSgcm_App/pull/521)
+* Add in missing `ESMF_ConfigSetAttribute` for `SNOW_ALBEDO_INFO` [#826](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/826)
+* Add checks on snow states after application of LDAS increments; StieglitzSnow cleanup [#834](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/834)
+* Add support for cice6 dumping intermediate restart in `CICE_plug` [#841](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/841)
+* Fixes for running coupled on macOS [#526](https://github.com/GEOS-ESM/GEOSgcm_App/pull/526)
+* Fixture changes:
+   * ESMA_env  [v4.19.0 => v4.20.0](https://github.com/GEOS-ESM/ESMA_env/compare/v4.19.0...v4.20.0)
+   * ESMA_cmake  [v3.34.0 => v3.35.0](https://github.com/GEOS-ESM/ESMA_cmake/compare/v3.34.0...v3.35.0)
+   * GMAO_Shared  [v1.9.4 => v1.9.5](https://github.com/GEOS-ESM/GMAO_Shared/compare/v1.9.4...v1.9.5)
+   * MAPL  [v2.41.0 => v2.41.1](https://github.com/GEOS-ESM/MAPL/compare/v2.41.0...v2.41.1)
+   * GEOSgcm_GridComp  [v2.3.0 => v2.3.1](https://github.com/GEOS-ESM/GEOSgcm_GridComp/compare/v2.3.0...v2.3.1)
+   * FVdycoreCubed_GridComp  [v2.7.0 => v2.8.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/compare/v2.7.0...v2.8.0)
+   * CICE6  [geos/v0.1.0 => geos/v0.1.1](https://github.com/GEOS-ESM/CICE/compare/geos/v0.1.0...geos/v0.1.2)
+   * icepack  [geos/v0.1.0 => geos/v0.1.1](https://github.com/GEOS-ESM/Icepack/compare/geos/v0.1.0...geos/v0.1.1)
+   * GEOSgcm_App  [v2.2.3 => v2.2.5](https://github.com/GEOS-ESM/GEOSgcm_App/compare/v2.2.3...v2.2.5)
+
 ## [11.3.0] - 2023-09-29
 
 ### Zero-diff to Previous Release: NO

CMakeLists.txt

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

README.md

@@ -23,7 +23,7 @@
 | [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp)           | [v2.1.3](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v2.1.3)                        |
 | [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.13.1](https://github.com/GEOS-ESM/GEOSchem_GridComp/releases/tag/v1.13.1)                       |
-| [GEOSgcm_App](https://github.com/GEOS-ESM/GEOSgcm_App)                         | [v2.2.4](https://github.com/GEOS-ESM/GEOSgcm_App/releases/tag/v2.2.4)                               |
+| [GEOSgcm_App](https://github.com/GEOS-ESM/GEOSgcm_App)                         | [v2.2.5](https://github.com/GEOS-ESM/GEOSgcm_App/releases/tag/v2.2.5)                               |
 | [GEOSgcm_GridComp](https://github.com/GEOS-ESM/GEOSgcm_GridComp)               | [v2.3.1](https://github.com/GEOS-ESM/GEOSgcm_GridComp/releases/tag/v2.3.1)                          |
 | [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.6.0](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere/releases/tag/geos%2Fv2.6.0)       |