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

Uptick to v11.5.1
GEOS-ESM · Jan 31, 2024 · 40981bc · 40981bc
2 parents 3c9b8f1 + 421762f
commit 40981bc
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,37 @@
 
 ## Unreleased
 
+## [11.5.1] - 2024-01-30
+
+### Zero-diff to Previous Release: YES
+### Restart Changes: NO
+
+### Major Zero-Diff Changes:
+* Integration of WMMA (WAVEWATCH, UMWM, sea spray) model components. This introduced new `AGCM.rc` parameters `USE_WAVES:` and `wave_model:`. Implementing WMMA involved the following changes:
+  * [GEOSgcm #724](https://github.com/GEOS-ESM/GEOSgcm/pull/724)
+  * [GEOSgcm_GridComp #872](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/872)
+  * [GEOS_OceanGridComp #59](https://github.com/GEOS-ESM/GEOS_OceanGridComp/pull/59)
+  * [GEOSgcm_App #552](https://github.com/GEOS-ESM/GEOSgcm_App/pull/552)
+  * [GMAO_Shared #339](https://github.com/GEOS-ESM/GMAO_Shared/pull/339)
+* SHOC-EDMF updates [#879](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/879)
+* Restore the `MTRI` bundle [#881](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/881)
+* Refine check for allowable bcs versions to be run with CatchCN [#882](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/882)
+* Allow others to make coupled experiments [#558](https://github.com/GEOS-ESM/GEOSgcm_App/pull/558)
+* Minor fixes of HISTORY for ADAS [#565](https://github.com/GEOS-ESM/GEOSgcm_App/pull/565)
+* Default to Cascade Lake at NCCS for SLES12 [#556](https://github.com/GEOS-ESM/GEOSgcm_App/pull/556)
+
+### Fixture Changes:
+* ESMA_env  [v4.24.0 => v4.25.1](https://github.com/GEOS-ESM/ESMA_env/compare/v4.24.0...v4.25.1)
+* ESMA_cmake  [v3.36.0 => v3.38.0](https://github.com/GEOS-ESM/ESMA_cmake/compare/v3.36.0...v3.38.0)
+* GMAO_Shared  [v1.9.6 => v1.9.7](https://github.com/GEOS-ESM/GMAO_Shared/compare/v1.9.6...v1.9.7)
+* MAPL  [v2.43.0 => v2.43.1](https://github.com/GEOS-ESM/MAPL/compare/v2.43.0...v2.43.1)
+* GEOSgcm_GridComp  [v2.5.0 => v2.5.1](https://github.com/GEOS-ESM/GEOSgcm_GridComp/compare/v2.5.0...v2.5.1)
+* GEOS_OceanGridComp  [v2.1.4 => v2.1.5](https://github.com/GEOS-ESM/GEOS_OceanGridComp/compare/v2.1.4...v2.1.5)
+* GEOSgcm_App  [v2.3.0 => v2.3.1](https://github.com/GEOS-ESM/GEOSgcm_App/compare/v2.3.0...v2.3.1)
+* NEW [WW3 - WAVEWATCH III](https://github.com/GEOS-ESM/WW3/releases/tag/v6.07.1-geos-r2)
+* NEW [UMWM - University of Miami Wave Model](https://github.com/GEOS-ESM/umwm/releases/tag/v2.0.0-geos-r1)
+
+
 ## [11.5.0] - 2024-01-23
 
 ### Zero-diff to Previous Release: NO

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,7 +4,7 @@ cmake_policy (SET CMP0054 NEW)
 
 project (
   GEOSgcm
-  VERSION 11.5.0
+  VERSION 11.5.1
   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
@@ -43,6 +43,8 @@
 | [StratChem](https://github.com/GEOS-ESM/StratChem)                             | [v1.0.0](https://github.com/GEOS-ESM/StratChem/releases/tag/v1.0.0)                                 |
 | [TR](https://github.com/GEOS-ESM/TR)                                           | [v1.1.0](https://github.com/GEOS-ESM/TR/releases/tag/v1.1.0)                                        |
 | [UMD_Etc](https://github.com/GEOS-ESM/UMD_Etc)                                 | [v1.3.0](https://github.com/GEOS-ESM/UMD_Etc/releases/tag/v1.3.0)                                   |
+| [WW3](https://github.com/GEOS-ESM/WW3)                                         | [v6.07.1-geos-r2](https://github.com/GEOS-ESM/WW3/releases/tag/v6.07.1-geos-r2)                     |
+| [umwm](https://github.com/GEOS-ESM/umwm)                                       | [v2.0.0-geos-r1](https://github.com/GEOS-ESM/umwm/releases/tag/v2.0.0-geos-r1)                      |
 
 ## How to build GEOS GCM