Merge branch 'main' into release/MAPL-v3

# Conflicts: # components.yaml
GEOS-ESM · Dec 1, 2023 · cfdc76b · cfdc76b
2 parents b0fa0bb + c789869
commit cfdc76b
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,31 @@
 
 ## Unreleased
 
+## [11.4.0] - 2023-12-01
+
+### Zero-diff to Previous Release: YES
+### Restart Changes: YES (see below)
+
+* Updates to moist from `feature/wmputman/KM_v11_3_2_Moist_WMP` as of 2023-11-21 [#858](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/858). The following restarts have changed:
+   1. `moist_import_checkpoint` was cleaned up to reduce the file size by removing the following variables:
+   DQVDTDYN, DTDTDYN, OMEGA, PHIS, PLE, PLE_DYN_IN, PREF, QV_DYN_IN, T, TAUOROX, TAUOROY, T_DYN_IN, U, U_DYN_IN, V, V_DYN_IN, W, ZLE
+   2. `gocart_import_checkpoint` fixed variable: QCTOT
+* Use 3 specific `MOM6` resolutions [#542](https://github.com/GEOS-ESM/GEOSgcm_App/pull/542)
+* Added support for `CICE6` thermo state rewind for replay [#854](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/854)
+* New release of fvdycore [v2.8.0](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere/releases/tag/geos%2Fv2.8.0) fixed non-layout-reproducibility at C180 and higher which was introduced in v2.
+* Bugfix in boundary conditions for coupled T3MOM6 option [#861](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/861)
+* Add ocean version to tile file header info [#860](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/860)
+* Major fixes to enable `EASY` coupled model experiments [#538](https://github.com/GEOS-ESM/GEOSgcm_App/pull/538)
+* Sync `DT` changes from `gcm_setup` into other setup scripts [#541](https://github.com/GEOS-ESM/GEOSgcm_App/pull/541)
+* Fixture changes:
+   * ESMA_env  [v4.20.6 => v4.22.0](https://github.com/GEOS-ESM/ESMA_env/compare/v4.20.6...v4.22.0)
+   * GEOSgcm_GridComp  [v2.3.2 => v2.4.0](https://github.com/GEOS-ESM/GEOSgcm_GridComp/compare/v2.3.2...v2.4.0)
+   * fvdycore  [v2.7.0 => v2.8.0](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere/compare/geos/v2.7.0...geos/v2.8.0)
+   * GEOS_OceanGridComp  [v2.1.3 => v2.1.4](https://github.com/GEOS-ESM/GEOS_OceanGridComp/compare/v2.1.3...v2.1.4)
+   * MOM6  [geos/v2.2.2 => geos/v2.2.3](https://github.com/GEOS-ESM/MOM6/compare/geos/v2.2.2...geos/v2.2.3)
+   * CICE6  [geos/v0.1.2 => geos/v0.1.3](https://github.com/GEOS-ESM/CICE/compare/geos/v0.1.2...geos/v0.1.3)
+   * GEOSgcm_App  [v2.2.7 => v2.2.8](https://github.com/GEOS-ESM/GEOSgcm_App/compare/v2.2.7...v2.2.8)
+
 ## [11.3.3] - 2023-11-17
 
 ### 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.3.3
+  VERSION 11.4.0
   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
@@ -23,8 +23,8 @@
 | [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp)           | [v2.1.4](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v2.1.4)                        |
 | [GEOS_Util](https://github.com/GEOS-ESM/GEOS_Util)                             | [v2.0.4](https://github.com/GEOS-ESM/GEOS_Util/releases/tag/v2.0.4)                                 |
 | [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.7](https://github.com/GEOS-ESM/GEOSgcm_App/releases/tag/v2.2.7)                               |
-| [GEOSgcm_GridComp](https://github.com/GEOS-ESM/GEOSgcm_GridComp)               | [v2.3.2](https://github.com/GEOS-ESM/GEOSgcm_GridComp/releases/tag/v2.3.2)                          |
+| [GEOSgcm_App](https://github.com/GEOS-ESM/GEOSgcm_App)                         | [v2.2.8](https://github.com/GEOS-ESM/GEOSgcm_App/releases/tag/v2.2.8)                               |
+| [GEOSgcm_GridComp](https://github.com/GEOS-ESM/GEOSgcm_GridComp)               | [v2.4.0](https://github.com/GEOS-ESM/GEOSgcm_GridComp/releases/tag/v2.4.0)                          |
 | [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.8.0](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere/releases/tag/geos%2Fv2.8.0)       |
 | [GMI](https://github.com/GEOS-ESM/GMI)                                         | [v1.1.0](https://github.com/GEOS-ESM/GMI/releases/tag/v1.1.0)                                       |