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

Uptick to v11.6.2
GEOS-ESM · Oct 23, 2024 · fdbab3d · fdbab3d
2 parents 3e78df3 + a546712
commit fdbab3d
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,46 @@
 
 ## Unreleased
 
+## [11.6.2] - 2024-10-23
+
+### Zero-diff to Previous Release: YES
+### Restart Changes: NO
+
+### Major Zero-Diff Changes:
+
+* gcc14: Compile icepack data file at `-O0` [#982](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/982)
+* Add new C1120 resolution to BCS package [#961](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/961)
+* Add new C1120 resolution to remap restarts [#94](https://github.com/GEOS-ESM/GEOS_Util/pull/94)
+* Add GEOS-IT option for remap restarts [#96](https://github.com/GEOS-ESM/GEOS_Util/pull/96)
+* Add land constants as HISTORY export variables [#970](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/970)
+* Add definition of land constants collection into `HISTORY.rc.tmpl` [#636](https://github.com/GEOS-ESM/GEOSgcm_App/pull/636)
+* Remove filling of `WET1` (a.k.a. `GWETTOP`) with 1s over non-land [#974](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/974)
+* Fixed conversion of minimal `CAPAC` to `RUNOFF` (catchment.F90) [#991](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/991)
+* Send clear message to log when `mk_LakeLandiceSaltRestarts` fails [#1006](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/1006)
+* Fixes [#984](https://github.com/GEOS-ESM/GEOSgcm_GridComp/issues/984), bug in which `ZLCL` was unfilled with BACM or MGB2 [#985](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/985)
+* Fixes [#1009](https://github.com/GEOS-ESM/GEOSgcm_GridComp/issues/1009), incorrect units in GF precip fluxes [#1010](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/1010)
+* Plots package bug fixes for `EXPID` names containing periods [#103](https://github.com/GEOS-ESM/GEOS_Util/pull/103)
+* gcc14: Add int to main in `makdep.c` [#356](https://github.com/GEOS-ESM/GMAO_Shared/pull/356)
+* v11: Update Intel MPI flags [#652](https://github.com/GEOS-ESM/GEOSgcm_App/pull/652)
+* Remove executables on tmpdir [#644](https://github.com/GEOS-ESM/GEOSgcm_App/pull/644)
+* Update n4zip to fix deprecated option [#354](https://github.com/GEOS-ESM/GMAO_Shared/pull/354)
+* Update ESMF CMake target to `ESMF::ESMF` [#978](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/978) [#638](https://github.com/GEOS-ESM/GEOSgcm_App/pull/638) [#92](https://github.com/GEOS-ESM/GEOS_Util/pull/92) [#355](https://github.com/GEOS-ESM/GMAO_Shared/pull/355)
+
+### Fixture Changes:
+* ESMA_env  [v4.29.0 => v4.29.1](https://github.com/GEOS-ESM/ESMA_env/compare/v4.29.0...v4.29.1)
+* ESMA_cmake  [v3.48.0 => v3.52.0](https://github.com/GEOS-ESM/ESMA_cmake/compare/v3.48.0...v3.52.0)
+* ecbuild  [geos/v1.3.0 => geos/v1.4.0](https://github.com/GEOS-ESM/ecbuild/compare/geos/v1.3.0...geos/v1.4.0)
+* GMAO_Shared  [v1.9.8 => v1.9.9](https://github.com/GEOS-ESM/GMAO_Shared/compare/v1.9.8...v1.9.9)
+* GEOS_Util  [v2.1.2 => v2.1.3](https://github.com/GEOS-ESM/GEOS_Util/compare/v2.1.2...v2.1.3)
+* MAPL  [v2.47.1 => v2.50.1](https://github.com/GEOS-ESM/MAPL/compare/v2.47.1...v2.50.1)
+* GEOSgcm_GridComp  [v2.6.1 => v2.6.2](https://github.com/GEOS-ESM/GEOSgcm_GridComp/compare/v2.6.1...v2.6.2)
+* FVdycoreCubed_GridComp  [v2.11.1 => v2.12.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/compare/v2.11.1...v2.12.0)
+* GEOS_OceanGridComp  [v2.1.6 => v2.3.0](https://github.com/GEOS-ESM/GEOS_OceanGridComp/compare/v2.1.6...v2.3.0)
+* MOM6  [geos/v3.1 => geos/v3.3](https://github.com/GEOS-ESM/MOM6/compare/geos/v3.1...geos/v3.3)
+* GEOSradiation_GridComp  [v1.8.0 => v1.9.0](https://github.com/GEOS-ESM/GEOSradiation_GridComp/compare/v1.8.0...v1.9.0)
+* GEOSgcm_App  [v2.3.4 => v2.3.5](https://github.com/GEOS-ESM/GEOSgcm_App/compare/v2.3.4...v2.3.5)
+
+
 ## [11.6.1] - 2024-08-01
 
 ### 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.6.1
+  VERSION 11.6.2
   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.12.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.12.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.3.0](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v2.3.0)                        |
-| [GEOS_Util](https://github.com/GEOS-ESM/GEOS_Util)                             | [v2.1.2](https://github.com/GEOS-ESM/GEOS_Util/releases/tag/v2.1.2)                                 |
+| [GEOS_Util](https://github.com/GEOS-ESM/GEOS_Util)                             | [v2.1.3](https://github.com/GEOS-ESM/GEOS_Util/releases/tag/v2.1.3)                                 |
 | [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.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)                          |
+| [GEOSgcm_App](https://github.com/GEOS-ESM/GEOSgcm_App)                         | [v2.3.5](https://github.com/GEOS-ESM/GEOSgcm_App/releases/tag/v2.3.5)                               |
+| [GEOSgcm_GridComp](https://github.com/GEOS-ESM/GEOSgcm_GridComp)               | [v2.6.2](https://github.com/GEOS-ESM/GEOSgcm_GridComp/releases/tag/v2.6.2)                          |
 | [GEOSradiation_GridComp](https://github.com/GEOS-ESM/GEOSradiation_GridComp)   | [v1.9.0](https://github.com/GEOS-ESM/GEOSradiation_GridComp/releases/tag/v1.9.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
@@ -36,7 +36,7 @@ GMAO_Shared:
 GEOS_Util:
   local: ./src/Shared/@GMAO_Shared/@GEOS_Util
   remote: ../GEOS_Util.git
-  tag: v2.1.2
+  tag: v2.1.3
   develop: main
 
 # When updating the MAPL version, also update the MAPL version in the
@@ -56,7 +56,7 @@ FMS:
 GEOSgcm_GridComp:
   local: ./src/Components/@GEOSgcm_GridComp
   remote: ../GEOSgcm_GridComp.git
-  tag: v2.6.1
+  tag: v2.6.2
   sparse: ./config/GEOSgcm_GridComp.sparse
   develop: develop
 
@@ -191,7 +191,7 @@ umwm:
 GEOSgcm_App:
   local: ./src/Applications/@GEOSgcm_App
   remote: ../GEOSgcm_App.git
-  tag: v2.3.4
+  tag: v2.3.5
   develop: develop
 
 UMD_Etc: