Merge branch 'main' into feature/adarmenov/integrate-wmma

GEOS-ESM · Jan 30, 2024 · bb63b46 · bb63b46
2 parents 3297f58 + 44585a0
commit bb63b46
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 15 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -103,7 +103,7 @@ workflows:
           bcs_version: *bcs_version
           container_name: geosgcm
           mpi_name: openmpi
-          mpi_version: 4.1.4
+          mpi_version: 5.0.0
           compiler_name: gcc
           compiler_version: 12.1.0
           image_name: geos-env-bcs

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -35,7 +35,7 @@ jobs:
       - name: Delete huge unnecessary tools folder
         run: rm -rf /opt/hostedtoolcache
       - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.12.0
+        uses: styfle/cancel-workflow-action@0.12.1
         with:
           access_token: ${{ github.token }}
       - name: Checkout GCM

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,37 @@
 
 ## Unreleased
 
+## [11.5.0] - 2024-01-23
+
+### Zero-diff to Previous Release: NO
+### Restart Changes: NO
+
+### Major Non-Zero-Diff Changes:
+* NWP patches to get `BACM` forecast RMSE back to Jason levels [#883](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/883)
+* Changed `gcm_setup` to set `OX_RELAXTIME` to 0.0 s when using OPS emissions (consistent with DAS), otherwise it remains at 259200 s [#560](https://github.com/GEOS-ESM/GEOSgcm_App/pull/560)
+* Corresponding upgrade of [FVdycoreCubed_GridComp v2.10.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.10.0)
+* Replay import patch for ozone in tag [GOCART sdr_v2.2.1.1](https://github.com/GEOS-ESM/GOCART/releases/tag/sdr_v2.2.1.1)
+
+### Major Zero-Diff Changes:
+* Added the necessary exports for TLM/ADJ back to `MOIST` [#883](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/883)
+* Added connectivity for a few fields from `MOIST` to `CHEM` [#867](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/867)
+* Run `make_bcs` in different installation path [#870](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/870)
+* Fixes #547 - bad default target_lat [#548](https://github.com/GEOS-ESM/GEOSgcm_App/pull/548)
+* Update MPT flags for use with MAPL 2.44 (current develop) [#553](https://github.com/GEOS-ESM/GEOSgcm_App/pull/553)
+* Add tuning flags for Open MPI and Intel MPI on SLES15 at NCCS [#543](https://github.com/GEOS-ESM/GEOSgcm_App/pull/543)
+
+### Fixture Changes:
+* ESMA_env  [v4.22.0 => v4.24.0](https://github.com/GEOS-ESM/ESMA_env/compare/v4.22.0...v4.24.0)
+* GEOS_Util  [v2.0.4 => v2.0.5](https://github.com/GEOS-ESM/GEOS_Util/compare/v2.0.4...v2.0.5)
+* MAPL  [v2.42.0 => v2.43.0](https://github.com/GEOS-ESM/MAPL/compare/v2.42.0...v2.43.0)
+* GEOSgcm_GridComp  [v2.4.0 => v2.5.0](https://github.com/GEOS-ESM/GEOSgcm_GridComp/compare/v2.4.0...v2.5.0)
+* FVdycoreCubed_GridComp  [v2.9.0 => v2.10.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/compare/v2.9.0...v2.10.0)
+* fvdycore  [v2.8.0 => v2.8.1](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere/compare/geos/v2.8.0...geos/v2.8.1)
+* GOCART [v2.2.1 => sdr_v2.2.1.1](https://github.com/GEOS-ESM/GOCART/compare/v2.2.1...sdr_v2.2.1.1)
+* GEOSradiation_GridComp [v1.5.1 => v1.6.0](https://github.com/GEOS-ESM/GEOSradiation_GridComp/compare/v1.5.1...v1.6.0)
+* GEOSgcm_App  [v2.2.8 => v2.3.0](https://github.com/GEOS-ESM/GEOSgcm_App/compare/v2.2.8...v2.3.0)
+
+
 ## [11.4.0] - 2023-12-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.4.0
+  VERSION 11.5.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
@@ -15,24 +15,24 @@
 | [CICE](https://github.com/GEOS-ESM/CICE)                                       | [geos/v0.1.3](https://github.com/GEOS-ESM/CICE/releases/tag/geos%2Fv0.1.3)                          |
 | [CPLFCST_Etc](https://github.com/GEOS-ESM/CPLFCST_Etc)                         | [v1.0.1](https://github.com/GEOS-ESM/CPLFCST_Etc/releases/tag/v1.0.1)                               |
 | [ecbuild](https://github.com/GEOS-ESM/ecbuild)                                 | [geos/v1.3.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv1.3.0)                       |
-| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake)                           | [v3.36.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v3.36.0)                              |
-| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env)                               | [v4.24.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v4.24.0)                                |
+| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake)                           | [v3.38.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v3.38.0)                              |
+| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env)                               | [v4.25.1](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v4.25.1)                                |
 | [FMS](https://github.com/GEOS-ESM/FMS)                                         | [geos/2019.01.02+noaff.8](https://github.com/GEOS-ESM/FMS/releases/tag/geos%2F2019.01.02%2Bnoaff.8) |
-| [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp)   | [v2.9.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.9.0)                    |
+| [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp)   | [v2.10.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.10.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.5](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v2.1.5)                        |
 | [GEOS_Util](https://github.com/GEOS-ESM/GEOS_Util)                             | [v2.0.5](https://github.com/GEOS-ESM/GEOS_Util/releases/tag/v2.0.5)                                 |
 | [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.3.1](https://github.com/GEOS-ESM/GEOSgcm_App/releases/tag/v2.3.1)                               |
 | [GEOSgcm_GridComp](https://github.com/GEOS-ESM/GEOSgcm_GridComp)               | [v2.5.1](https://github.com/GEOS-ESM/GEOSgcm_GridComp/releases/tag/v2.5.1)                          |
-| [GEOSradiation_GridComp](https://github.com/GEOS-ESM/GEOSradiation_GridComp)   | [v1.5.1](https://github.com/GEOS-ESM/GEOSradiation_GridComp/releases/tag/v1.5.1)                    |
+| [GEOSradiation_GridComp](https://github.com/GEOS-ESM/GEOSradiation_GridComp)   | [v1.6.0](https://github.com/GEOS-ESM/GEOSradiation_GridComp/releases/tag/v1.6.0)                    |
 | [GFDL_atmos_cubed_sphere](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere) | [geos/v2.8.1](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere/releases/tag/geos%2Fv2.8.1)       |
 | [GMI](https://github.com/GEOS-ESM/GMI)                                         | [v1.1.0](https://github.com/GEOS-ESM/GMI/releases/tag/v1.1.0)                                       |
 | [GMAO_Shared](https://github.com/GEOS-ESM/GMAO_Shared)                         | [v1.9.7](https://github.com/GEOS-ESM/GMAO_Shared/releases/tag/v1.9.7)                               |
-| [GOCART](https://github.com/GEOS-ESM/GOCART)                                   | [v2.2.1](https://github.com/GEOS-ESM/GOCART/releases/tag/v2.2.1)                                    |
+| [GOCART](https://github.com/GEOS-ESM/GOCART)                                   | [sdr_v2.2.1.1](https://github.com/GEOS-ESM/GOCART/releases/tag/sdr_v2.2.1.1)                                    |
 | [HEMCO](https://github.com/GEOS-ESM/HEMCO)                                     | [geos/v2.2.3](https://github.com/GEOS-ESM/HEMCO/releases/tag/geos%2Fv2.2.3)                         |
 | [Icepack](https://github.com/GEOS-ESM/Icepack)                                 | [geos/v0.1.1](https://github.com/GEOS-ESM/Icepack/releases/tag/geos%2Fv0.1.1)                       |
-| [MAPL](https://github.com/GEOS-ESM/MAPL)                                       | [v2.42.3](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.42.3)                                    |
+| [MAPL](https://github.com/GEOS-ESM/MAPL)                                       | [v2.43.0](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.43.0)                                    |
 | [MITgcm](https://github.com/GEOS-ESM/MITgcm)                                   | [checkpoint68o](https://github.com/GEOS-ESM/MITgcm/releases/tag/checkpoint68o)                      |
 | [MOM5](https://github.com/GEOS-ESM/MOM5)                                       | [geos/5.1.0+1.2.0](https://github.com/GEOS-ESM/MOM5/releases/tag/geos%2F5.1.0%2B1.2.0)              |
 | [MOM6](https://github.com/GEOS-ESM/MOM6)                                       | [geos/v2.2.3](https://github.com/GEOS-ESM/MOM6/tree/geos/v2.2.3)                                    |

diff --git a/components.yaml b/components.yaml
@@ -5,13 +5,13 @@ GEOSgcm:
 env:
   local: ./@env
   remote: ../ESMA_env.git
-  tag: v4.24.0
+  tag: v4.25.1
   develop: main
 
 cmake:
   local: ./@cmake
   remote: ../ESMA_cmake.git
-  tag: v3.36.0
+  tag: v3.38.0
   develop: develop
 
 ecbuild:
@@ -42,7 +42,7 @@ GEOS_Util:
 MAPL:
   local: ./src/Shared/@MAPL
   remote: ../MAPL.git
-  tag: v2.42.3
+  tag: v2.43.0
   develop: develop
 
 FMS:
@@ -61,7 +61,7 @@ GEOSgcm_GridComp:
 FVdycoreCubed_GridComp:
   local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp
   remote: ../FVdycoreCubed_GridComp.git
-  tag: v2.9.0
+  tag: v2.10.0
   develop: develop
 
 fvdycore:
@@ -91,7 +91,7 @@ geos-chem:
 GOCART:
   local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@GOCART
   remote: ../GOCART.git
-  tag: v2.2.1
+  tag: sdr_v2.2.1.1
   develop: develop
 
 QuickChem:
@@ -164,7 +164,7 @@ sis2:
 GEOSradiation_GridComp:
   local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSradiation_GridComp
   remote: ../GEOSradiation_GridComp.git
-  tag: v1.5.1
+  tag: v1.6.0
   develop: develop
 
 RRTMGP: