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

Uptick to v11.6.1
GEOS-ESM · Aug 1, 2024 · c3a0f1b · c3a0f1b
2 parents 62259b8 + 4d44bad
commit c3a0f1b
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,37 @@
 
 ## Unreleased
 
+## [11.6.1] - 2024-08-01
+
+### Zero-diff to Previous Release: YES
+### Restart Changes: NO
+
+### Major Zero-Diff Changes:
+
+* `linkbcs` bugfix for coupled runs using v12 bcs [#623](https://github.com/GEOS-ESM/GEOSgcm_App/pull/623)
+* Exports and `LONG_NAMES` changes for land water and energy balances [#957](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/957)
+* New and renamed exports added to`HISTORY.rc.tmpl` for land water and energy balances [#621](https://github.com/GEOS-ESM/GEOSgcm_App/pull/621)
+* Update GMI and StratChem HISTORY [#627](https://github.com/GEOS-ESM/GEOSgcm_App/pull/627)
+* Routing Outlets in Boundary Conditions [#827](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/827)
+* Bugfix to remove double-counting of heat corr (`StieglitzSnow.F90`) [#946](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/946)
+* Bugfix whereby `TMPHIST` was not created during cloning [#626](https://github.com/GEOS-ESM/GEOSgcm_App/pull/626)
+* Fixes for Ninja builds [#966](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/966)
+* Added MASKFILE for time-discontinuous data for TEM diagnostics [#89](https://github.com/GEOS-ESM/GEOS_Util/pull/89)
+* Add MOM6 C90 ogrid option to `remap_utils.py` [#83](https://github.com/GEOS-ESM/GEOS_Util/pull/83)
+* Bugfix for `time_ave.rc` [#86](https://github.com/GEOS-ESM/GEOS_Util/pull/86)
+
+### Fixture Changes:
+* ESMA_cmake  [v3.45.2 => v3.48.0](https://github.com/GEOS-ESM/ESMA_cmake/compare/v3.45.2...v3.48.0)
+* GMAO_Shared  [v1.9.7 => v1.9.8](https://github.com/GEOS-ESM/GMAO_Shared/compare/v1.9.7...v1.9.8)
+* GEOS_Util  [v2.1.0 => v2.1.2](https://github.com/GEOS-ESM/GEOS_Util/compare/v2.1.0...v2.1.2)
+* MAPL  [v2.46.1 => v2.47.1](https://github.com/GEOS-ESM/MAPL/compare/v2.46.1...v2.47.1)
+* GEOSgcm_GridComp  [v2.6.0 => v2.6.1](https://github.com/GEOS-ESM/GEOSgcm_GridComp/compare/v2.6.0...v2.6.1)
+* GEOSchem_GridComp  [v1.13.1 => v1.14.0](https://github.com/GEOS-ESM/GEOSchem_GridComp/compare/v1.13.1...v1.14.0)
+* TR  [v1.1.0 => v1.2.0](https://github.com/GEOS-ESM/TR/compare/v1.1.0...v1.2.0)
+* GMI  [v1.1.0 => v1.3.0](https://github.com/GEOS-ESM/GMI/compare/v1.1.0...v1.3.0)
+* GEOSgcm_App  [v2.3.3 => v2.3.4](https://github.com/GEOS-ESM/GEOSgcm_App/compare/v2.3.3...v2.3.4)
+
+
 ## [11.6.0] - 2024-06-11
 
 ### 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.6.0
+  VERSION 11.6.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
@@ -23,8 +23,8 @@
 | [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp)           | [v2.1.6](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v2.1.6)                        |
 | [GEOS_Util](https://github.com/GEOS-ESM/GEOS_Util)                             | [v2.1.2](https://github.com/GEOS-ESM/GEOS_Util/releases/tag/v2.1.2)                                 |
 | [GEOSchem_GridComp](https://github.com/GEOS-ESM/GEOSchem_GridComp)             | [v1.14.0](https://github.com/GEOS-ESM/GEOSchem_GridComp/releases/tag/v1.14.0)                       |
-| [GEOSgcm_App](https://github.com/GEOS-ESM/GEOSgcm_App)                         | [v2.3.3](https://github.com/GEOS-ESM/GEOSgcm_App/releases/tag/v2.3.3)                               |
-| [GEOSgcm_GridComp](https://github.com/GEOS-ESM/GEOSgcm_GridComp)               | [v2.6.0](https://github.com/GEOS-ESM/GEOSgcm_GridComp/releases/tag/v2.6.0)                          |
+| [GEOSgcm_App](https://github.com/GEOS-ESM/GEOSgcm_App)                         | [v2.3.4](https://github.com/GEOS-ESM/GEOSgcm_App/releases/tag/v2.3.4)                               |
+| [GEOSgcm_GridComp](https://github.com/GEOS-ESM/GEOSgcm_GridComp)               | [v2.6.1](https://github.com/GEOS-ESM/GEOSgcm_GridComp/releases/tag/v2.6.1)                          |
 | [GEOSradiation_GridComp](https://github.com/GEOS-ESM/GEOSradiation_GridComp)   | [v1.8.0](https://github.com/GEOS-ESM/GEOSradiation_GridComp/releases/tag/v1.8.0)                    |
 | [GFDL_atmos_cubed_sphere](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere) | [geos/v2.9.0](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere/releases/tag/geos%2Fv2.9.0)       |
 | [GMI](https://github.com/GEOS-ESM/GMI)                                         | [v1.3.0](https://github.com/GEOS-ESM/GMI/releases/tag/v1.3.0)                                       |

diff --git a/components.yaml b/components.yaml
@@ -54,7 +54,7 @@ FMS:
 GEOSgcm_GridComp:
   local: ./src/Components/@GEOSgcm_GridComp
   remote: ../GEOSgcm_GridComp.git
-  tag: v2.6.0
+  tag: v2.6.1
   sparse: ./config/GEOSgcm_GridComp.sparse
   develop: develop
 
@@ -189,7 +189,7 @@ umwm:
 GEOSgcm_App:
   local: ./src/Applications/@GEOSgcm_App
   remote: ../GEOSgcm_App.git
-  tag: v2.3.3
+  tag: v2.3.4
   develop: develop
 
 UMD_Etc: