From 0e3b5cb1e2197e970414dfa47fc383bcce990643 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 20 Jan 2023 09:41:50 -0500 Subject: [PATCH 1/9] Move GEOS_Util to a separate repo --- README.md | 1 + components.yaml | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 01a0f169..da63275a 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,7 @@ | [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.0](https://github.com/GEOS-ESM/GEOS_Util/releases/tag/v1.0.0) | | [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_GridComp](https://github.com/GEOS-ESM/GEOSgcm_GridComp) | [v1.17.3](https://github.com/GEOS-ESM/GEOSgcm_GridComp/releases/tag/v1.17.3) | diff --git a/components.yaml b/components.yaml index d6093654..fc042eba 100644 --- 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 + branch: feature/mathomp4/separate-geos-util sparse: ./config/GMAO_Shared.sparse develop: main +GEOS_Util: + local: ./src/Shared/@GMAO_Shared/@GEOS_Util + remote: ../GEOS_Util.git + branch: main + develop: main + MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git From 3eba5b88436fb328724980fdd740270313b8f0ef Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 20 Jan 2023 11:12:27 -0500 Subject: [PATCH 2/9] Update to GEOSgcm_App v1.9.0 --- README.md | 4 ++-- components.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index da63275a..81b76480 100644 --- a/README.md +++ b/README.md @@ -23,12 +23,12 @@ | [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.0](https://github.com/GEOS-ESM/GEOS_Util/releases/tag/v1.0.0) | | [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) | diff --git a/components.yaml b/components.yaml index fc042eba..3497e2a3 100644 --- a/components.yaml +++ b/components.yaml @@ -166,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: From 6e4279899463945e3479b75c048582ffbf21032e Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 20 Jan 2023 11:16:11 -0500 Subject: [PATCH 3/9] Update to GEOS_Util v1.0.0 --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index 3497e2a3..d7882f30 100644 --- 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 - branch: main + tag: v1.0.0 develop: main MAPL: From 24e81ec19290b2e99547e6559a18807ece8da51e Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 20 Jan 2023 12:01:07 -0500 Subject: [PATCH 4/9] Move to GMAO_Shared v1.7.0 --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index d7882f30..7390a76a 100644 --- a/components.yaml +++ b/components.yaml @@ -29,7 +29,7 @@ NCEP_Shared: GMAO_Shared: local: ./src/Shared/@GMAO_Shared remote: ../GMAO_Shared.git - branch: feature/mathomp4/separate-geos-util + tag: v1.7.0 sparse: ./config/GMAO_Shared.sparse develop: main From 06395e496208048e9cdc1163519f9fe61736e277 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 20 Jan 2023 12:02:48 -0500 Subject: [PATCH 5/9] Add GEOS_Util to -develop flag --- README.md | 12 ++++++------ parallel_build.csh | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 81b76480..f16b6c06 100644 --- a/README.md +++ b/README.md @@ -149,7 +149,7 @@ 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 @@ -157,7 +157,7 @@ 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 @@ -205,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/parallel_build.csh b/parallel_build.csh index 3b63c33b..6a3b19e9 100755 --- a/parallel_build.csh +++ b/parallel_build.csh @@ -32,7 +32,7 @@ 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" + echo "Checking out development branches of GEOSgcm_GridComp, GEOSgcm_App, GMAO_Shared, and GEOS_Util" mepo develop GEOSgcm_GridComp GEOSgcm_App GMAO_Shared endif else @@ -46,7 +46,7 @@ else mepo init mepo clone if ( "$DEVELOP" == "TRUE" ) then - echo "Checking out development branches of GEOSgcm_GridComp, GEOSgcm_App, and 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 endif endif From fe9b3ccb7760b94f34989e9d0b1e6ab0ecf6582f Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 20 Jan 2023 12:08:14 -0500 Subject: [PATCH 6/9] Move to GEOS_Util v1.0.1 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f16b6c06..e25e7649 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ | [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.0](https://github.com/GEOS-ESM/GEOS_Util/releases/tag/v1.0.0) | +| [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.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) | diff --git a/components.yaml b/components.yaml index 7390a76a..0263e969 100644 --- 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: v1.0.0 + tag: v1.0.1 develop: main MAPL: From b6c040007d47ceb0fb0dba2463a091be1263df6c Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 20 Jan 2023 12:35:34 -0500 Subject: [PATCH 7/9] Fix parallel_build --- parallel_build.csh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parallel_build.csh b/parallel_build.csh index 6a3b19e9..e32c2668 100755 --- a/parallel_build.csh +++ b/parallel_build.csh @@ -33,7 +33,7 @@ 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, GMAO_Shared, and GEOS_Util" - mepo develop GEOSgcm_GridComp GEOSgcm_App GMAO_Shared + mepo develop GEOSgcm_GridComp GEOSgcm_App GMAO_Shared GEOS_Util endif else if ($?PBS_JOBID || $?SLURM_JOBID) then @@ -47,7 +47,7 @@ else mepo clone if ( "$DEVELOP" == "TRUE" ) then echo "Checking out 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 endif endif endif From e916a8adb3bfbc78900b8b5c401e8d19b4b43279 Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst <53346946+sdrabenh@users.noreply.github.com> Date: Fri, 20 Jan 2023 14:41:54 -0500 Subject: [PATCH 8/9] Update CHANGELOG.md --- CHANGELOG.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 036e314d..7d4689fa 100644 --- 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 From a7b2cc5c995c14472f2d7b407660ee55cd437aca Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst <53346946+sdrabenh@users.noreply.github.com> Date: Fri, 20 Jan 2023 14:42:23 -0500 Subject: [PATCH 9/9] Update CMakeLists.txt --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6be6764a..9796ea63 100644 --- 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}")