Merge pull request #520 from GEOS-ESM/feature/mathomp4/esma_env_4.10.0

Update to ESMA_env v4.17.0, GEOSgcm_App v2.2.0, GOCART sdr_v2.1.2.7
GEOS-ESM · Jun 8, 2023 · 5974c74 · 5974c74
2 parents 3296321 + 5bece2d
commit 5974c74
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 24 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -16,7 +16,7 @@ parameters:
 
 # Anchors to prevent forgetting to update a version
 os_version: &os_version ubuntu20
-baselibs_version: &baselibs_version v7.7.0
+baselibs_version: &baselibs_version v7.13.0
 bcs_version: &bcs_version v11.00.0
 tag_build_arg_name: &tag_build_arg_name gcmversion
 

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -19,7 +19,7 @@ jobs:
     if: "!contains(github.event.pull_request.labels.*.name, '0 diff trivial')"
     runs-on: ubuntu-latest
     container:
-      image: gmao/ubuntu20-geos-env:v7.7.0-intelmpi_2021.6.0-intel_2022.1.0
+      image: gmao/ubuntu20-geos-env:v7.13.0-intelmpi_2021.6.0-intel_2022.1.0
       # Per https://github.com/actions/virtual-environments/issues/1445#issuecomment-713861495
       # It seems like we might not need secrets on GitHub Actions which is good for forked
       # pull requests

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,19 @@
 
 ## Unreleased
 
+## [11.1.0] - 2023-06-08
+
+### Zero-diff to Previous Release: NO
+### Restart Changes: NO
+
+### Major Non-Zero-Diff Changes:
+* Bugfix for GOCART: In dust and sea-salt, changed dimensions back to `globalCellCountPerDim` since these are needed to determine emission tuning parameters, not to allocate arrays. See changes [here](https://github.com/GEOS-ESM/GOCART/compare/sdr_v2.1.2.6...sdr_v2.1.2.7)
+* Update to use NRL 2022 Solar Cycle File. Therefore, non-zero-diff results from Y2022 onward. [#468](https://github.com/GEOS-ESM/GEOSgcm_App/pull/468)
+* Updates GEOSgcm to use [ESMA_env v4.17.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v4.17.0). This update mainly brings in ESMF v8.5.0b22 which is a non-zero-diff change for GEOSgcm due to precision changes in grid generation. It also brings in many new features for MAPL development.
+
+### Major Zero-Diff Changes:
+* Updates GEOSgcm to use [FVdycoreCubed_GridComp v2.4.4](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.4.4) and [GFDL_atmos_cubed_sphere geos/v2.4.1](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere/releases/tag/geos%2Fv2.4.1). These updates bring in fixes for the FV3 standalone allowing it to work correctly. The GEOSgcm is zero-diff to these changes.
+
 ## [11.0.4] - 2023-06-07
 
 ### Zero-diff to Previous Release: YES
@@ -602,7 +615,7 @@ Major 0-diff changes include:
 6. Bugfix to detect if saltwater splitting is needed in more files.
 7. Add `IOSERVER` code into `gcm_forecast.tmpl`.
 8. Updates needed for `GEOSadas` to work with MAPL2.
-9. Add GEOS-Chem and HEMCO as separate external repositories. 
+9. Add GEOS-Chem and HEMCO as separate external repositories.
 10. GMI is now set to import RI and RL only when running Cloud-J. This is a work-around for a CTM issue.
 11. Uptick of MAPL and FMS repositories.
 
@@ -645,7 +658,7 @@ Major changes include:
 
 Major changes include:
 
-1. parallel_build.csh now accepts a `-hydrostatic` or `-nonhydrostatic` argument during building. If no argument is provided the model will build hydrostatically as before. Therefore, setup scripts were modified depending on what -DHYDROSTATIC option was supplied to CMake. If -DHYDROSTATIC=ON then it will assume the user wants to use hydrostatic dynamics options and vice versa. 
+1. parallel_build.csh now accepts a `-hydrostatic` or `-nonhydrostatic` argument during building. If no argument is provided the model will build hydrostatically as before. Therefore, setup scripts were modified depending on what -DHYDROSTATIC option was supplied to CMake. If -DHYDROSTATIC=ON then it will assume the user wants to use hydrostatic dynamics options and vice versa.
 2. Fixed decomposition regression for nonhydrostatic model.
 3. Updates from ADAS 5.27 folded into git GMAO_Shared v1.3.9. This brings the GEOSadas code closer to the current GEOSgcm.
 4. Upticks in MOM6, MAPL, env and other repositiories.
@@ -1024,10 +1037,10 @@ Major changes are:
 
 1. RRTMG_SW:
    Updates RRTMG_SW in GEOS to be equivalent to RRTMG_SW v4.10. This fix increases the heating rates near the stratospause region and is a non zero-diff change.
-   
+
 2. RAS_NO_NEG:
    Provides an optional flag that ensures RAS results are non-negative. This is an important fix for chemical species that was extremely useful in the Icarus but did not make it into Jason. The fix is "off" by default and therefore zero-diff.
-   
+
 3. Plots:
  * Enable additional upper levels for forecast stats plots.
  * Add QITOT & QLTOT to horizontal plots.
@@ -1062,7 +1075,7 @@ History and ExtData file access and writing. By default, these IO
 servers run on the same resources (i.e., nodes) as the application.
 However, `gcm_setup` and `gcm_run.j` have been altered so that, by
 default, at high-resolution (C180+) the IO servers are on separate nodes
-for performance and memory reasons. 
+for performance and memory reasons.
 
 ## [10.8.0] - 2020-02-06
 
@@ -1117,9 +1130,9 @@ If the new interface is turned on, then the user must provide additional fields
    The updated algorthm allows for 2 types of REPLAY:
 
      1. Exact     (Uses Archived Increment Files)
-     
+
         Exact REPLAYs identically reproduce (bit-for-bit) a previous GEOS DAS experiment by simply using the archived IAU forcing from the DAS experiment. For these cases, only the CORRECTOR step is employed and is, therefore, as efficient as a stand-alone model run.
-     
+
      2. Regular  (Uses Archived Analysis/Assimilation Files)
 
         Regular REPLAYs are used to mimic the original IAU methodology, i.e., both the PREDICTOR and the CORRECTOR steps are employed. The key difference being that the Analysis is based on archived datasets. These Analyses may be from the GEOS DAS system, or from any other source that is written using the appropriate GEOS DAS ana.eta data format.
@@ -1215,7 +1228,7 @@ StratChem and GMIchem setup scripts to better match gcm_setup.
 
 ### Restart Changes: NO
 
-1. Move to GMAO_Shared 1.0.4 to merge more updates from CVS for plots 
+1. Move to GMAO_Shared 1.0.4 to merge more updates from CVS for plots
 2. Updates for Travis CI
 
 ## [10.3.2 / Jason-3_2] - 2019-08-02
@@ -1269,7 +1282,7 @@ Due to changes in import states and
 diagnostics, these restarts have changed but are passive to the
 prognostic restarts:
 
-* irrad_internal_rst 
+* irrad_internal_rst
 * surf_import_rst
 * tr_internal_rst
 * turb_import_rst
@@ -1344,7 +1357,7 @@ differences)
 * GOCART IMPORT was modified by adding LWI and FRACI to be non-skip
 * TR IMPORT was modified by removing ALL but CLDTT (from RAD), since TR is run after SURF RUN(1,2)
 * Note:  When TR adopts a 2-phase approach, additional IMPORT variables from SURF will need to be included.
- 
+
 ### Model Changes
 
 1. An error was found related to GOCART and TR regarding the TR
@@ -1371,7 +1384,7 @@ due to its second-order influence.
 ### Restart Changes: YES
 
 * `saltwater_internal` ==> `openwater_internal` & `seaicethermo_internal`
- 
+
 ### Model Changes
 
 1. Saltwater split => openwater and seaicethermo.  This means

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,7 +4,7 @@ cmake_policy (SET CMP0054 NEW)
 
 project (
   GEOSgcm
-  VERSION 11.0.4
+  VERSION 11.1.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
@@ -16,20 +16,20 @@
 | [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.29.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v3.29.0)                              |
-| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env)                               | [v4.9.3](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v4.9.3)                                  |
+| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env)                               | [v4.17.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v4.17.0)                                |
 | [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.4.3](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.4.3)                    |
+| [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp)   | [v2.4.4](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.4.4)                    |
 | [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.1](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v2.1.1)                        |
 | [GEOS_Util](https://github.com/GEOS-ESM/GEOS_Util)                             | [v2.0.0](https://github.com/GEOS-ESM/GEOS_Util/releases/tag/v2.0.0)                                 |
 | [GEOSchem_GridComp](https://github.com/GEOS-ESM/GEOSchem_GridComp)             | [v1.12.2](https://github.com/GEOS-ESM/GEOSchem_GridComp/releases/tag/v1.12.2)                       |
-| [GEOSgcm_App](https://github.com/GEOS-ESM/GEOSgcm_App)                         | [v2.1.3](https://github.com/GEOS-ESM/GEOSgcm_App/releases/tag/v2.1.3)                               |
+| [GEOSgcm_App](https://github.com/GEOS-ESM/GEOSgcm_App)                         | [v2.2.0](https://github.com/GEOS-ESM/GEOSgcm_App/releases/tag/v2.2.0)                               |
 | [GEOSgcm_GridComp](https://github.com/GEOS-ESM/GEOSgcm_GridComp)               | [v2.1.3](https://github.com/GEOS-ESM/GEOSgcm_GridComp/releases/tag/v2.1.3)                          |
 | [GEOSradiation_GridComp](https://github.com/GEOS-ESM/GEOSradiation_GridComp)   | [v1.4.0](https://github.com/GEOS-ESM/GEOSradiation_GridComp/releases/tag/v1.4.0)                    |
-| [GFDL_atmos_cubed_sphere](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere) | [geos/v2.4.0](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere/releases/tag/geos%2Fv2.4.0)       |
+| [GFDL_atmos_cubed_sphere](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere) | [geos/v2.4.1](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere/releases/tag/geos%2Fv2.4.1)       |
 | [GMI](https://github.com/GEOS-ESM/GMI)                                         | [v1.0.0](https://github.com/GEOS-ESM/GMI/releases/tag/v1.0.0)                                       |
 | [GMAO_Shared](https://github.com/GEOS-ESM/GMAO_Shared)                         | [v1.9.1](https://github.com/GEOS-ESM/GMAO_Shared/releases/tag/v1.9.1)                               |
-| [GOCART](https://github.com/GEOS-ESM/GOCART)                                   | [sdr_v2.1.2.6](https://github.com/GEOS-ESM/GOCART/releases/tag/sdr_v2.1.2.6)                        |
+| [GOCART](https://github.com/GEOS-ESM/GOCART)                                   | [sdr_v2.1.2.7](https://github.com/GEOS-ESM/GOCART/releases/tag/sdr_v2.1.2.7)                        |
 | [HEMCO](https://github.com/GEOS-ESM/HEMCO)                                     | [geos/v2.2.3](https://github.com/GEOS-ESM/HEMCO/releases/tag/geos%2Fv2.2.3)                         |
 | [MAPL](https://github.com/GEOS-ESM/MAPL)                                       | [v2.39.1](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.39.1)                                    |
 | [MITgcm](https://github.com/GEOS-ESM/MITgcm)                                   | [checkpoint68o](https://github.com/GEOS-ESM/MITgcm/releases/tag/checkpoint68o)                      |

diff --git a/components.yaml b/components.yaml
@@ -5,7 +5,7 @@ GEOSgcm:
 env:
   local: ./@env
   remote: ../ESMA_env.git
-  tag: v4.9.3
+  tag: v4.17.0
   develop: main
 
 cmake:
@@ -61,13 +61,13 @@ GEOSgcm_GridComp:
 FVdycoreCubed_GridComp:
   local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp
   remote: ../FVdycoreCubed_GridComp.git
-  tag: v2.4.3
+  tag: v2.4.4
   develop: develop
 
 fvdycore:
   local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp/@fvdycore
   remote: ../GFDL_atmos_cubed_sphere.git
-  tag: geos/v2.4.0
+  tag: geos/v2.4.1
   develop: geos/develop
 
 GEOSchem_GridComp:
@@ -91,7 +91,7 @@ geos-chem:
 GOCART:
   local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@GOCART
   remote: ../GOCART.git
-  tag: sdr_v2.1.2.6
+  tag: sdr_v2.1.2.7
   develop: develop
 
 QuickChem:
@@ -171,7 +171,7 @@ RRTMGP:
 GEOSgcm_App:
   local: ./src/Applications/@GEOSgcm_App
   remote: ../GEOSgcm_App.git
-  tag: v2.1.3
+  tag: v2.2.0
   develop: develop
 
 UMD_Etc: