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

Uptick to release v11.3.3
GEOS-ESM · Nov 17, 2023 · 2c18cb0 · 2c18cb0
2 parents 71c5f04 + 40fd3e5
commit 2c18cb0
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,29 @@
 
 ## Unreleased
 
+## [11.3.3] - 2023-11-17
+
+### Zero-diff to Previous Release: YES
+### Restart Changes: NO
+
+### Major Zero-Diff Changes:
+* Merge branches `feature/wmputman/hwt_spring_exp` and `feature/donifan/KrokMG3` into `develop` [#855](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/855)
+   * Merges in the latest changes of MGB2_2M code
+   * More updates to GF2020 and GFDL
+* Update DTs in `gcm_setup` for non-stock configurations [#537](https://github.com/GEOS-ESM/GEOSgcm_App/pull/537)
+* Updated/added command line feature for `remap_restarts.py` [#19](https://github.com/GEOS-ESM/GEOS_Util/pull/19)
+* Further cleanup of boundary conditions [#846](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/846)
+* Minor land related code cleanup (coeffsib) [#845](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/845)
+* Add fv namelist entry for AIST work [#696](https://github.com/GEOS-ESM/GEOSgcm/pull/696)
+* Fixture changes:
+   * NCEP_Shared  [v1.2.1 => v1.3.0](https://github.com/GEOS-ESM/NCEP_Shared/compare/v1.2.1...v1.3.0)
+   * GMAO_Shared  [v1.9.5 => v1.9.6](https://github.com/GEOS-ESM/GMAO_Shared/compare/v1.9.5...v1.9.6)
+   * GEOS_Util  [v2.0.3 => v2.0.4](https://github.com/GEOS-ESM/GEOS_Util/compare/v2.0.3...v2.0.4)
+   * GEOSgcm_GridComp  [v2.3.1 => v2.3.2](https://github.com/GEOS-ESM/GEOSgcm_GridComp/compare/v2.3.1...v2.3.2)
+   * FVdycoreCubed_GridComp  [v2.8.0 => v2.9.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/compare/v2.8.0...v2.9.0)
+   * fvdycore  [v2.6.0 => v2.7.0](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere/compare/geos/v2.6.0...geos/v2.7.0)
+   * GEOSgcm_App  [v2.2.6 => v2.2.7](https://github.com/GEOS-ESM/GEOSgcm_App/compare/v2.2.6...v2.2.7)
+
 ## [11.3.2] - 2023-10-31
 
 ### 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.2
+  VERSION 11.3.3
   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,10 +21,10 @@
 | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp)   | [v2.9.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.9.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.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)                                 |
+| [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.6](https://github.com/GEOS-ESM/GEOSgcm_App/releases/tag/v2.2.6)                               |
-| [GEOSgcm_GridComp](https://github.com/GEOS-ESM/GEOSgcm_GridComp)               | [v2.3.1](https://github.com/GEOS-ESM/GEOSgcm_GridComp/releases/tag/v2.3.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)                          |
 | [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.7.0](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere/releases/tag/geos%2Fv2.7.0)       |
 | [GMI](https://github.com/GEOS-ESM/GMI)                                         | [v1.1.0](https://github.com/GEOS-ESM/GMI/releases/tag/v1.1.0)                                       |

diff --git a/components.yaml b/components.yaml
@@ -36,7 +36,7 @@ GMAO_Shared:
 GEOS_Util:
   local: ./src/Shared/@GMAO_Shared/@GEOS_Util
   remote: ../GEOS_Util.git
-  tag: v2.0.3
+  tag: v2.0.4
   develop: main
 
 MAPL:
@@ -54,7 +54,7 @@ FMS:
 GEOSgcm_GridComp:
   local: ./src/Components/@GEOSgcm_GridComp
   remote: ../GEOSgcm_GridComp.git
-  tag: v2.3.1
+  tag: v2.3.2
   sparse: ./config/GEOSgcm_GridComp.sparse
   develop: develop
 
@@ -177,7 +177,7 @@ RRTMGP:
 GEOSgcm_App:
   local: ./src/Applications/@GEOSgcm_App
   remote: ../GEOSgcm_App.git
-  tag: v2.2.6
+  tag: v2.2.7
   develop: develop
 
 UMD_Etc: