Merge pull request #518 from GEOS-ESM/feature/mathomp4/separate-geos-…

…util Move GEOS_Util to a separate repo; Update to GEOSgcm_App v1.9.0
GEOS-ESM · Jan 20, 2023 · 27da643 · 27da643
2 parents 4c40ed6 + a7b2cc5
commit 27da643
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,22 @@
 
 ## Unreleased
 
+## [10.25.0] - 2023-01-20
+
+### Zero-diff to Previous Release: Not always
+### Restart Changes: NO
+
+### Potential Non-zero-diff Changes:
+* Updated to use 2021 NRL Solar File by @mathomp4 in https://github.com/GEOS-ESM/GEOSgcm_App/pull/366
+* Updated to use ExtData2G by default by @vbuchard in https://github.com/GEOS-ESM/GEOSgcm_App/pull/381
+
+## Zero-diff Changes for Stock Configuration
+* Fixes to allow non-72-level runs to use ExtData2G by @mathomp4 in https://github.com/GEOS-ESM/GEOSgcm_App/pull/389
+* Updated `logging.yaml` by adding YAML linter by @mathomp4 in https://github.com/GEOS-ESM/GEOSgcm_App/pull/391
+
+## Structural Changes
+* Moved `GEOS_Util` out of `GMAO_Shared` into its own repository.
+
 ## [10.24.0] - 2023-01-18
 
 ### 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 10.24.0
+  VERSION 10.25.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
@@ -21,13 +21,14 @@
 | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp)   | [v1.12.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v1.12.1)                  |
 | [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)           | [v1.2.1](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v1.2.1)                        |
+| [GEOS_Util](https://github.com/GEOS-ESM/GEOS_Util)                             | [v1.0.1](https://github.com/GEOS-ESM/GEOS_Util/releases/tag/v1.0.1)                                 |
 | [GEOSchem_GridComp](https://github.com/GEOS-ESM/GEOSchem_GridComp)             | [v1.12.0](https://github.com/GEOS-ESM/GEOSchem_GridComp/releases/tag/v1.12.0)                       |
-| [GEOSgcm_App](https://github.com/GEOS-ESM/GEOSgcm_App)                         | [v1.8.2](https://github.com/GEOS-ESM/GEOSgcm_App/releases/tag/v1.8.2)                               |
+| [GEOSgcm_App](https://github.com/GEOS-ESM/GEOSgcm_App)                         | [v1.9.0](https://github.com/GEOS-ESM/GEOSgcm_App/releases/tag/v1.9.0)                               |
 | [GEOSgcm_GridComp](https://github.com/GEOS-ESM/GEOSgcm_GridComp)               | [v1.17.3](https://github.com/GEOS-ESM/GEOSgcm_GridComp/releases/tag/v1.17.3)                        |
 | [GEOSradiation_GridComp](https://github.com/GEOS-ESM/GEOSradiation_GridComp)   | [v1.2.0](https://github.com/GEOS-ESM/GEOSradiation_GridComp/releases/tag/v1.2.0)                    |
 | [GFDL_atmos_cubed_sphere](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere) | [geos/v1.5.0](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere/releases/tag/geos%2Fv1.5.0)       |
 | [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.6.4](https://github.com/GEOS-ESM/GMAO_Shared/releases/tag/v1.6.4)                               |
+| [GMAO_Shared](https://github.com/GEOS-ESM/GMAO_Shared)                         | [v1.7.0](https://github.com/GEOS-ESM/GMAO_Shared/releases/tag/v1.7.0)                               |
 | [GOCART](https://github.com/GEOS-ESM/GOCART)                                   | [v2.1.2](https://github.com/GEOS-ESM/GOCART/releases/tag/v2.1.2)                                    |
 | [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.34.1](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.34.1)                                    |
@@ -148,15 +149,15 @@ If all you wish is to build the model, you can run `parallel_build.csh` from a h
 #### Develop Version of GEOS GCM
 
 `parallel_build.csh` provides a special flag for checking out the
-development branches of GEOSgcm_GridComp, GEOSgcm_App, and GMAO_Shared. If you run:
+development branches of GEOSgcm_GridComp, GEOSgcm_App, GMAO_Shared, and GEOS_Util. If you run:
 
 ```
 parallel_build.csh -develop
 ```
 then `mepo` will run:
 
 ```
-mepo develop GEOSgcm_GridComp GEOSgcm_App GMAO_Shared
+mepo develop GEOSgcm_GridComp GEOSgcm_App GMAO_Shared GEOS_Util
 ```
 
 #### Debug Version of GEOS GCM
@@ -204,15 +205,15 @@ The first command initializes the multi-repository and the second one
 clones and assembles all the sub-repositories according to
 `components.yaml`
 
-#### Checking out develop branches of GEOSgcm_GridComp, GEOSgcm_App, and GMAO_Shared
+#### Checking out develop branches of GEOSgcm_GridComp, GEOSgcm_App, GMAO_Shared, and GEOS_Util
 
-To get development branches of GEOSgcm_GridComp, GEOSgcm_App, and GMAO_Shared (a la
+To get development branches of GEOSgcm_GridComp, GEOSgcm_App, GMAO_Shared, and GEOS_Util (a la
 the `-develop` flag for `parallel_build.csh`, one needs to run the
 equivalent `mepo` command. As mepo itself knows (via `components.yaml`) what the development branch of each
 subrepository is, the equivalent of `-develop` for `mepo` is to
-checkout the development branches of GEOSgcm_GridComp, GEOSgcm_App, and GMAO_Shared:
+checkout the development branches of GEOSgcm_GridComp, GEOSgcm_App, GMAO_Shared, and GEOS_Util:
 ```
-mepo develop GEOSgcm_GridComp GEOSgcm_App GMAO_Shared
+mepo develop GEOSgcm_GridComp GEOSgcm_App GMAO_Shared GEOS_Util
 ```
 
 This must be done *after* `mepo clone` as it is running a git command in

diff --git a/components.yaml b/components.yaml
@@ -29,10 +29,16 @@ NCEP_Shared:
 GMAO_Shared:
   local: ./src/Shared/@GMAO_Shared
   remote: ../GMAO_Shared.git
-  tag: v1.6.4
+  tag: v1.7.0
   sparse: ./config/GMAO_Shared.sparse
   develop: main
 
+GEOS_Util:
+  local: ./src/Shared/@GMAO_Shared/@GEOS_Util
+  remote: ../GEOS_Util.git
+  tag: v1.0.1
+  develop: main
+
 MAPL:
   local: ./src/Shared/@MAPL
   remote: ../MAPL.git
@@ -160,7 +166,7 @@ RRTMGP:
 GEOSgcm_App:
   local: ./src/Applications/@GEOSgcm_App
   remote: ../GEOSgcm_App.git
-  tag: v1.8.2
+  tag: v1.9.0
   develop: develop
 
 UMD_Etc:

diff --git a/parallel_build.csh b/parallel_build.csh
@@ -32,8 +32,8 @@ end
 
 if (-d ${ESMADIR}/@env || -d ${ESMADIR}/env@ || -d ${ESMADIR}/env) then
    if ( "$DEVELOP" == "TRUE" ) then
-      echo "Checking out development branches of GEOSgcm_GridComp, GEOSgcm_App, and GMAO_Shared"
-      mepo develop GEOSgcm_GridComp GEOSgcm_App GMAO_Shared
+      echo "Checking out development branches of GEOSgcm_GridComp, GEOSgcm_App, GMAO_Shared, and GEOS_Util"
+      mepo develop GEOSgcm_GridComp GEOSgcm_App GMAO_Shared GEOS_Util
    endif
 else
    if ($?PBS_JOBID || $?SLURM_JOBID) then
@@ -46,8 +46,8 @@ else
       mepo init
       mepo clone
       if ( "$DEVELOP" == "TRUE" ) then
-         echo "Checking out development branches of GEOSgcm_GridComp, GEOSgcm_App, and GMAO_Shared"
-         mepo develop GEOSgcm_GridComp GEOSgcm_App GMAO_Shared
+         echo "Checking out development branches of GEOSgcm_GridComp, GEOSgcm_App, GMAO_Shared, and GEOS_Util"
+         mepo develop GEOSgcm_GridComp GEOSgcm_App GMAO_Shared GEOS_Util
       endif
    endif
 endif