From 3002716d3f5c469382ff04aee74df928107b20b9 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 6 Aug 2021 12:11:13 -0400 Subject: [PATCH 01/28] Components for GOCART2G Testing --- CHANGELOG.md | 2 ++ components.yaml | 15 +++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e9ca0a7..7d878891 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog +# This is based off of 10.17.6, but runs MAPL v.2.6.8 so GAAS2G can work. Also has GOCART2G. + ## [10.17.6] - 2021-04-06 ### Zero-diff to previous release: YES diff --git a/components.yaml b/components.yaml index 65e626a1..ac5fa93e 100644 --- a/components.yaml +++ b/components.yaml @@ -11,7 +11,7 @@ env: cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v3.3.7 + tag: v3.3.9 develop: develop ecbuild: @@ -36,7 +36,7 @@ GMAO_Shared: MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - tag: v2.6.4 + tag: v2.6.8 develop: develop FMS: @@ -48,7 +48,7 @@ FMS: GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - tag: v1.11.6 + branch: feature/esherman/gocart2g_develop_v2 sparse: ./config/GEOSgcm_GridComp.sparse develop: develop @@ -67,14 +67,13 @@ fvdycore: GEOSchem_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp remote: ../GEOSchem_GridComp.git - tag: v1.4.4 + branch: feature/pcolarco/#1-gocart2g-updates develop: develop GOCART: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@GOCART remote: ../GOCART.git - sparse: ./config/GOCART.sparse - tag: v1.0.1 + tag: v2.0.0-rc.1 develop: develop mom: @@ -88,12 +87,12 @@ mom6: remote: ../MOM6.git tag: geos/v2.0.1 develop: dev/gfdl - recurse_submodules: True + recurse_submodules: true GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git - tag: v1.3.16 + branch: feature/esherman/gocart2g_develop_v2_aerochemUpdates develop: develop UMD_Etc: From 231089857327230d6610dc7aa625c7148d63cfe4 Mon Sep 17 00:00:00 2001 From: Peter Colarco Date: Fri, 10 Sep 2021 12:27:55 -0400 Subject: [PATCH 02/28] prc: update components.yaml --- components.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components.yaml b/components.yaml index ac5fa93e..88df039c 100644 --- a/components.yaml +++ b/components.yaml @@ -67,13 +67,13 @@ fvdycore: GEOSchem_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp remote: ../GEOSchem_GridComp.git - branch: feature/pcolarco/#1-gocart2g-updates + tag: feature/#328/geos-v10.17.6/gocart/emissions_configuration-first-crack develop: develop GOCART: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@GOCART remote: ../GOCART.git - tag: v2.0.0-rc.1 + tag: feature/#328/geos-v10.17.6/gocart/emissions_configuration-first-crack develop: develop mom: @@ -92,7 +92,7 @@ mom6: GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git - branch: feature/esherman/gocart2g_develop_v2_aerochemUpdates + tag: feature/#328/geos-v10.17.6/gocart/emissions_configuration-first-crack develop: develop UMD_Etc: From 36482fe0176319b6e311f6a1c028a031bf140894 Mon Sep 17 00:00:00 2001 From: Peter Colarco Date: Fri, 10 Sep 2021 17:17:26 -0400 Subject: [PATCH 03/28] prc: update for remove legacy emissions configuration --- components.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components.yaml b/components.yaml index 88df039c..785d7696 100644 --- a/components.yaml +++ b/components.yaml @@ -67,13 +67,13 @@ fvdycore: GEOSchem_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp remote: ../GEOSchem_GridComp.git - tag: feature/#328/geos-v10.17.6/gocart/emissions_configuration-first-crack + tag: feature/#328/geos-v10.17.6/gocart/emissions_configuration-remove-legacy develop: develop GOCART: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@GOCART remote: ../GOCART.git - tag: feature/#328/geos-v10.17.6/gocart/emissions_configuration-first-crack + tag: feature/#328/geos-v10.17.6/gocart/emissions_configuration-remove-legacy develop: develop mom: @@ -92,7 +92,7 @@ mom6: GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git - tag: feature/#328/geos-v10.17.6/gocart/emissions_configuration-first-crack + tag: feature/#328/geos-v10.17.6/gocart/emissions_configuration-remove-legacy develop: develop UMD_Etc: From 75ab41c09f89da9f1fdd7813011c28f1883fd920 Mon Sep 17 00:00:00 2001 From: "Arlindo M. da Silva" Date: Mon, 4 Oct 2021 18:04:01 -0400 Subject: [PATCH 04/28] ams: towards new-extdata --- .gitignore | 3 +++ components.yaml | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index bbb5eb68..e6cdfe7c 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,6 @@ /.mepo/ parallel_build.o* log.* +\#*\# +\.\#* + diff --git a/components.yaml b/components.yaml index 785d7696..54cf2f03 100644 --- a/components.yaml +++ b/components.yaml @@ -67,13 +67,13 @@ fvdycore: GEOSchem_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp remote: ../GEOSchem_GridComp.git - tag: feature/#328/geos-v10.17.6/gocart/emissions_configuration-remove-legacy + hash: 5ebfd7c9042983a4b98a8745b6af3c7333c6bce6 develop: develop GOCART: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@GOCART remote: ../GOCART.git - tag: feature/#328/geos-v10.17.6/gocart/emissions_configuration-remove-legacy + branch: feature/geos-v10.17.6/gocart2g/v2.0.1 develop: develop mom: From 38bdee0e6537fc90d237bb23d44434ddec2accb9 Mon Sep 17 00:00:00 2001 From: "Arlindo M. da Silva" Date: Mon, 4 Oct 2021 19:09:04 -0400 Subject: [PATCH 05/28] ams: now on tag feature/#328/geos-v10.17.6/gocart2g/new-extdata/v2.0.1 --- components.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components.yaml b/components.yaml index 54cf2f03..68d22d42 100644 --- a/components.yaml +++ b/components.yaml @@ -73,7 +73,7 @@ GEOSchem_GridComp: GOCART: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@GOCART remote: ../GOCART.git - branch: feature/geos-v10.17.6/gocart2g/v2.0.1 + tag: feature/#328/geos-v10.17.6/gocart2g/new-extdata/v2.0.1 develop: develop mom: @@ -92,7 +92,7 @@ mom6: GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git - tag: feature/#328/geos-v10.17.6/gocart/emissions_configuration-remove-legacy + tag: feature/#328/geos-v10.17.6/gocart2g/new-extdata/v2.0.1 develop: develop UMD_Etc: From 3c25583709897c37f48a0cde7b17319421b200f3 Mon Sep 17 00:00:00 2001 From: "Arlindo M. da Silva" Date: Mon, 4 Oct 2021 23:03:44 -0400 Subject: [PATCH 06/28] ams: mods to achem rc files for new ExtData --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index 68d22d42..c1286efa 100644 --- a/components.yaml +++ b/components.yaml @@ -67,7 +67,7 @@ fvdycore: GEOSchem_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp remote: ../GEOSchem_GridComp.git - hash: 5ebfd7c9042983a4b98a8745b6af3c7333c6bce6 + tag: feature/#328/geos-v10.17.6/gocart2g/new-extdata/v2.0.1 develop: develop GOCART: From 7edf3f54521ebcb389df7a703dbdeb54204d8d15 Mon Sep 17 00:00:00 2001 From: "Arlindo M. da Silva" Date: Thu, 7 Oct 2021 12:01:01 -0400 Subject: [PATCH 07/28] ams: updated to tag feature/#328/geos-v10.17.6/gocart2g/new-extdata/v2.0.2 --- components.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/components.yaml b/components.yaml index c1286efa..48e6d8a9 100644 --- a/components.yaml +++ b/components.yaml @@ -48,7 +48,8 @@ FMS: GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - branch: feature/esherman/gocart2g_develop_v2 +# branch: feature/esherman/gocart2g_develop_v2 + tag: feature/#328/geos-v10.17.6/gocart2g/new-extdata/v2.0.2 sparse: ./config/GEOSgcm_GridComp.sparse develop: develop @@ -67,13 +68,13 @@ fvdycore: GEOSchem_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp remote: ../GEOSchem_GridComp.git - tag: feature/#328/geos-v10.17.6/gocart2g/new-extdata/v2.0.1 + tag: feature/#328/geos-v10.17.6/gocart2g/new-extdata/v2.0.2 develop: develop GOCART: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@GOCART remote: ../GOCART.git - tag: feature/#328/geos-v10.17.6/gocart2g/new-extdata/v2.0.1 + tag: feature/#328/geos-v10.17.6/gocart2g/new-extdata/v2.0.2 develop: develop mom: @@ -92,7 +93,7 @@ mom6: GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git - tag: feature/#328/geos-v10.17.6/gocart2g/new-extdata/v2.0.1 + tag: feature/#328/geos-v10.17.6/gocart2g/new-extdata/v2.0.2 develop: develop UMD_Etc: From c6cfc191e0196b41d84f81621c2c4b479d1e6284 Mon Sep 17 00:00:00 2001 From: "Arlindo M. da Silva" Date: Wed, 13 Oct 2021 15:05:46 -0400 Subject: [PATCH 08/28] ams: mods for tag feature/#328/geos-v10.17.6/gocart2g/new-extdata/v2.0.3 --- components.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components.yaml b/components.yaml index 48e6d8a9..75dac3c2 100644 --- a/components.yaml +++ b/components.yaml @@ -68,13 +68,13 @@ fvdycore: GEOSchem_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp remote: ../GEOSchem_GridComp.git - tag: feature/#328/geos-v10.17.6/gocart2g/new-extdata/v2.0.2 + tag: feature/#328/geos-v10.17.6/gocart2g/new-extdata/v2.0.3 develop: develop GOCART: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@GOCART remote: ../GOCART.git - tag: feature/#328/geos-v10.17.6/gocart2g/new-extdata/v2.0.2 + tag: feature/#328/geos-v10.17.6/gocart2g/new-extdata/v2.0.3 develop: develop mom: From 75186fe4cc6640d0d09b5f28e437b97da81ad456 Mon Sep 17 00:00:00 2001 From: Arlindo da Silva Date: Wed, 20 Oct 2021 00:19:50 -0400 Subject: [PATCH 09/28] ams: manual merge of components.yaml from main --- components.yaml | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/components.yaml b/components.yaml index 75dac3c2..8165e593 100644 --- a/components.yaml +++ b/components.yaml @@ -5,13 +5,13 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v3.2.0 + tag: v3.4.0 develop: main cmake: local: ./@cmake remote: ../ESMA_cmake.git - tag: v3.3.9 + tag: v3.6.2 develop: develop ecbuild: @@ -22,14 +22,14 @@ ecbuild: NCEP_Shared: local: ./src/Shared/@NCEP_Shared remote: ../NCEP_Shared.git - tag: v1.1.1 + tag: v1.2.0 sparse: ./config/NCEP_Shared.sparse develop: main GMAO_Shared: local: ./src/Shared/@GMAO_Shared remote: ../GMAO_Shared.git - tag: v1.3.10 + tag: v1.4.10 sparse: ./config/GMAO_Shared.sparse develop: main @@ -49,38 +49,50 @@ GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git # branch: feature/esherman/gocart2g_develop_v2 - tag: feature/#328/geos-v10.17.6/gocart2g/new-extdata/v2.0.2 + tag: feature/#328/geos-v10.17.6/gocart2g/new-extdata/v2.0.4 sparse: ./config/GEOSgcm_GridComp.sparse develop: develop FVdycoreCubed_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp remote: ../FVdycoreCubed_GridComp.git - tag: v1.2.11 + tag: v1.2.17 develop: develop fvdycore: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp/@fvdycore remote: ../GFDL_atmos_cubed_sphere.git - tag: geos/v1.1.5 + tag: geos/v1.1.7 develop: geos/develop GEOSchem_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp remote: ../GEOSchem_GridComp.git - tag: feature/#328/geos-v10.17.6/gocart2g/new-extdata/v2.0.3 + tag: feature/#328/geos-v10.17.6/gocart2g/new-extdata/v2.0.4 develop: develop +HEMCO: + local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/Shared/HEMCO/@HEMCO + remote: ../HEMCO.git + tag: geos/v2.2.1 + develop: geos/develop + +geos-chem: + local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/GEOSCHEMchem_GridComp/@geos-chem + remote: ../geos-chem.git + tag: geos/v13.0.0-rc1 + develop: geos/develop + GOCART: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@GOCART remote: ../GOCART.git - tag: feature/#328/geos-v10.17.6/gocart2g/new-extdata/v2.0.3 + tag: feature/#328/geos-v10.17.6/gocart2g/new-extdata/v2.0.4 develop: develop mom: local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/GEOSocean_GridComp/GuestOcean_GridComp/MOM_GEOS5PlugMod/@mom remote: ../MOM5.git - tag: geos/5.1.0+1.1.1 + tag: geos/5.1.0+1.2.0 develop: geos5 mom6: @@ -93,13 +105,13 @@ mom6: GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git - tag: feature/#328/geos-v10.17.6/gocart2g/new-extdata/v2.0.2 + tag: feature/#328/geos-v10.17.6/gocart2g/new-extdata/v2.0.4 develop: develop UMD_Etc: local: ./src/Applications/@UMD_Etc remote: ../UMD_Etc.git - tag: v1.0.3 + tag: v1.0.4 develop: main CPLFCST_Etc: From 98f5c4927661a454e63ef6ae9c1a66bd2c77cb44 Mon Sep 17 00:00:00 2001 From: Arlindo da Silva Date: Wed, 20 Oct 2021 21:57:44 -0400 Subject: [PATCH 10/28] ams: GOCART now points to v2.0.1 --- components.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components.yaml b/components.yaml index 8165e593..995aab44 100644 --- a/components.yaml +++ b/components.yaml @@ -86,8 +86,8 @@ geos-chem: GOCART: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@GOCART remote: ../GOCART.git - tag: feature/#328/geos-v10.17.6/gocart2g/new-extdata/v2.0.4 - develop: develop + tag: v2.0.1 + develop: develop mom: local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/GEOSocean_GridComp/GuestOcean_GridComp/MOM_GEOS5PlugMod/@mom From 63a29c4325308561b0f387f0835500b07d636577 Mon Sep 17 00:00:00 2001 From: Arlindo da Silva Date: Thu, 21 Oct 2021 19:05:59 -0400 Subject: [PATCH 11/28] ams: updates components.yaml for proper GEOSchem and MAPL versions that reintroduce AERO_ACI --- components.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components.yaml b/components.yaml index 995aab44..59c12a30 100644 --- a/components.yaml +++ b/components.yaml @@ -36,7 +36,7 @@ GMAO_Shared: MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - tag: v2.6.8 + tag: feature/#328/geos-v10.17.6/gocart2g/new-extdata/v2.0.5 develop: develop FMS: @@ -68,7 +68,7 @@ fvdycore: GEOSchem_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp remote: ../GEOSchem_GridComp.git - tag: feature/#328/geos-v10.17.6/gocart2g/new-extdata/v2.0.4 + tag: feature/#328/geos-v10.17.6/gocart2g/new-extdata/v2.0.5 develop: develop HEMCO: From 8aed1457b2c1adbaa3f2a68d29fc06f743d1de86 Mon Sep 17 00:00:00 2001 From: Tom Clune Date: Fri, 22 Oct 2021 11:04:20 -0400 Subject: [PATCH 12/28] Corrected path clashes in Ocean gridcomp. At some intervening point, the `GEOSocean_GridComp` directory was renamed `GEOS_OceanGridComp` and this was inconsistently reflected in the components.yaml file. --- components.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components.yaml b/components.yaml index 59c12a30..50c0ccfa 100644 --- a/components.yaml +++ b/components.yaml @@ -90,13 +90,13 @@ GOCART: develop: develop mom: - local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/GEOSocean_GridComp/GuestOcean_GridComp/MOM_GEOS5PlugMod/@mom + local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/GEOS_OceanGridComp/MOM_GEOS5PlugMod/@mom remote: ../MOM5.git tag: geos/5.1.0+1.2.0 develop: geos5 mom6: - local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/GEOSocean_GridComp/GuestOcean_GridComp/MOM6_GEOSPlug/@mom6 + local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/GEOS_OceanGridComp/MOM6_GEOSPlug/@mom6 remote: ../MOM6.git tag: geos/v2.0.1 develop: dev/gfdl From 477924c59561de0dd28e54efc9abcfe0732d6fc7 Mon Sep 17 00:00:00 2001 From: Tom Clune Date: Fri, 22 Oct 2021 12:01:20 -0400 Subject: [PATCH 13/28] Updated MAPL revision to include new release. New MAPL release has the desired `TO_NAME` access. --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index 50c0ccfa..2648db6e 100644 --- a/components.yaml +++ b/components.yaml @@ -36,7 +36,7 @@ GMAO_Shared: MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - tag: feature/#328/geos-v10.17.6/gocart2g/new-extdata/v2.0.5 + tag: v2.10.0 develop: develop FMS: From e434e5cd60d842c542868f4dd365a1f39915ec90 Mon Sep 17 00:00:00 2001 From: Tom Clune Date: Tue, 26 Oct 2021 16:26:39 -0400 Subject: [PATCH 14/28] Update .gitignore --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index e6cdfe7c..c5bec0a9 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,5 @@ /.mepo/ parallel_build.o* log.* -\#*\# \.\#* From d959cf928796f02bffffa8758f8c10d2b2b7c653 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 4 Jan 2022 10:53:48 -0500 Subject: [PATCH 15/28] Remove spaces to trigger CI --- components.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components.yaml b/components.yaml index d8380fcc..aa72c66d 100644 --- a/components.yaml +++ b/components.yaml @@ -74,19 +74,19 @@ HEMCO: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/Shared/HEMCO/@HEMCO remote: ../HEMCO.git tag: geos/v2.2.1 - develop: geos/develop + develop: geos/develop geos-chem: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/GEOSCHEMchem_GridComp/@geos-chem remote: ../geos-chem.git tag: geos/v13.0.0-rc1 develop: geos/develop - + GOCART: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@GOCART remote: ../GOCART.git tag: v2.0.1 - develop: develop + develop: develop mom: local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/GEOS_OceanGridComp/MOM_GEOS5PlugMod/@mom From ffc808161510527ee81e589ab2fe05b04eb8b7dd Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst <53346946+sdrabenh@users.noreply.github.com> Date: Tue, 4 Jan 2022 12:11:49 -0500 Subject: [PATCH 16/28] Update components.yaml --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index aa72c66d..a21ae005 100644 --- a/components.yaml +++ b/components.yaml @@ -85,7 +85,7 @@ geos-chem: GOCART: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@GOCART remote: ../GOCART.git - tag: v2.0.1 + tag: v2.0.2 develop: develop mom: From 7769ddbc81b1c49723b357ef23a718b7d3e3a8db Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 4 Jan 2022 13:01:06 -0500 Subject: [PATCH 17/28] Make the Intel Large executor actually xlarge --- .circleci/config.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 14cca6a0..1e77d882 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -33,7 +33,8 @@ executors: auth: username: $DOCKERHUB_USER password: $DOCKERHUB_AUTH_TOKEN - resource_class: large + resource_class: xlarge + #LARGE# resource_class: large #MEDIUM# resource_class: medium ifort-xlarge: @@ -53,7 +54,7 @@ workflows: matrix: parameters: compiler: [gfortran, ifort] - context: + context: - docker-hub-creds ################################################## # - run-gcm-exp: # From 799ca96d570998a3b56731029dbea82954dccf47 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 6 Jan 2022 12:23:58 -0500 Subject: [PATCH 18/28] Add on-fail extra build --- .circleci/config.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1e77d882..8f389e0c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -33,8 +33,7 @@ executors: auth: username: $DOCKERHUB_USER password: $DOCKERHUB_AUTH_TOKEN - resource_class: xlarge - #LARGE# resource_class: large + resource_class: large #MEDIUM# resource_class: medium ifort-xlarge: @@ -111,6 +110,13 @@ jobs: cd ${CIRCLE_WORKING_DIRECTORY}/workspace/build-GEOSgcm make -j"$(nproc)" install |& tee /logfiles/make.log #MEDIUM# make -j4 install |& tee /logfiles/make.log + - run: + name: "Retry build and install after failure" + command: | + cd ${CIRCLE_WORKING_DIRECTORY}/workspace/build-GEOSgcm + make -j"$(nproc)" install |& tee /logfiles/make-retry.log + #MEDIUM# make -j4 install |& tee /logfiles/make-retry.log + when: on_fail - run: name: "Compress artifacts" command: | From e118988a2420f68922e792378d8b03fa5c09249e Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst <53346946+sdrabenh@users.noreply.github.com> Date: Fri, 14 Jan 2022 11:47:58 -0500 Subject: [PATCH 19/28] Update components.yaml --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index a21ae005..3c5f5184 100644 --- a/components.yaml +++ b/components.yaml @@ -36,7 +36,7 @@ GMAO_Shared: MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - tag: v2.14.1 + tag: v2.16.0 develop: develop FMS: From 9654abc0edd001913fb1260393990bdc894a2a6c Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst <53346946+sdrabenh@users.noreply.github.com> Date: Wed, 26 Jan 2022 16:06:53 -0500 Subject: [PATCH 20/28] Update components.yaml --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index 3c5f5184..30cdd40e 100644 --- a/components.yaml +++ b/components.yaml @@ -36,7 +36,7 @@ GMAO_Shared: MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - tag: v2.16.0 + tag: v2.17.0 develop: develop FMS: From b9f521dd77ce351098dd79368336e84eef43caa4 Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst <53346946+sdrabenh@users.noreply.github.com> Date: Mon, 14 Feb 2022 13:42:04 -0500 Subject: [PATCH 21/28] Update components.yaml --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index 033323dc..13d4a12a 100644 --- a/components.yaml +++ b/components.yaml @@ -85,7 +85,7 @@ geos-chem: GOCART: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@GOCART remote: ../GOCART.git - tag: v2.0.2 + tag: v2.0.3 develop: develop mom: From b340a9c95df3186f73fe078c4ffac64d3c159372 Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst <53346946+sdrabenh@users.noreply.github.com> Date: Mon, 14 Feb 2022 13:43:11 -0500 Subject: [PATCH 22/28] Update components.yaml --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index 13d4a12a..98a18c11 100644 --- a/components.yaml +++ b/components.yaml @@ -67,7 +67,7 @@ fvdycore: GEOSchem_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp remote: ../GEOSchem_GridComp.git - branch: feature/#328/geos-v10.19.4/gocart2g + branch: develop develop: develop HEMCO: From d4875db84d1cf10a9d514066df46242aaa5bccc5 Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst <53346946+sdrabenh@users.noreply.github.com> Date: Mon, 14 Feb 2022 14:09:09 -0500 Subject: [PATCH 23/28] Update components.yaml --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index 98a18c11..bcc28cd9 100644 --- a/components.yaml +++ b/components.yaml @@ -67,7 +67,7 @@ fvdycore: GEOSchem_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp remote: ../GEOSchem_GridComp.git - branch: develop + tag: v1.8.0 develop: develop HEMCO: From 03f28fb8cb14ffc95f0d2018a74a5da333cffcba Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 14 Feb 2022 14:19:16 -0500 Subject: [PATCH 24/28] Update readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index cadfa3f0..0c48becf 100644 --- a/README.md +++ b/README.md @@ -19,12 +19,12 @@ | [FMS](https://github.com/GEOS-ESM/FMS) | [geos/2019.01.02+noaff.7](https://github.com/GEOS-ESM/FMS/releases/tag/geos%2F2019.01.02%2Bnoaff.7) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v1.6.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v1.6.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) | -| [GEOSchem_GridComp](https://github.com/GEOS-ESM/GEOSchem_GridComp) | [v1.7.0](https://github.com/GEOS-ESM/GEOSchem_GridComp/releases/tag/v1.7.0) | +| [GEOSchem_GridComp](https://github.com/GEOS-ESM/GEOSchem_GridComp) | [v1.8.0](https://github.com/GEOS-ESM/GEOSchem_GridComp/releases/tag/v1.8.0) | | [GEOSgcm_App](https://github.com/GEOS-ESM/GEOSgcm_App) | [v1.6.2](https://github.com/GEOS-ESM/GEOSgcm_App/releases/tag/v1.6.1) | | [GEOSgcm_GridComp](https://github.com/GEOS-ESM/GEOSgcm_GridComp) | [v1.14.1](https://github.com/GEOS-ESM/GEOSgcm_GridComp/releases/tag/v1.14.1) | | [GFDL_atmos_cubed_sphere](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere) | [geos/v1.3.0](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere/releases/tag/geos%2Fv1.3.0) | | [GMAO_Shared](https://github.com/GEOS-ESM/GMAO_Shared) | [v1.5.1](https://github.com/GEOS-ESM/GMAO_Shared/releases/tag/v1.5.1) | -| [GOCART](https://github.com/GEOS-ESM/GOCART) | [v1.0.1](https://github.com/GEOS-ESM/GOCART/releases/tag/v1.0.1) | +| [GOCART](https://github.com/GEOS-ESM/GOCART) | [v2.0.3](https://github.com/GEOS-ESM/GOCART/releases/tag/v2.0.3) | | [HEMCO](https://github.com/GEOS-ESM/HEMCO) | [geos/v2.2.1](https://github.com/GEOS-ESM/HEMCO/releases/tag/geos%2Fv2.2.1) | | [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.17.0](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.17.0) | | [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) | From 7bb06437c6cf9b0cf213a955c95c3ea2be851520 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 18 Feb 2022 11:12:17 -0500 Subject: [PATCH 25/28] Update components.yaml to HEMCO geos/v2.2.2 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0c48becf..318a2c2d 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ | [GFDL_atmos_cubed_sphere](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere) | [geos/v1.3.0](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere/releases/tag/geos%2Fv1.3.0) | | [GMAO_Shared](https://github.com/GEOS-ESM/GMAO_Shared) | [v1.5.1](https://github.com/GEOS-ESM/GMAO_Shared/releases/tag/v1.5.1) | | [GOCART](https://github.com/GEOS-ESM/GOCART) | [v2.0.3](https://github.com/GEOS-ESM/GOCART/releases/tag/v2.0.3) | -| [HEMCO](https://github.com/GEOS-ESM/HEMCO) | [geos/v2.2.1](https://github.com/GEOS-ESM/HEMCO/releases/tag/geos%2Fv2.2.1) | +| [HEMCO](https://github.com/GEOS-ESM/HEMCO) | [geos/v2.2.2](https://github.com/GEOS-ESM/HEMCO/releases/tag/geos%2Fv2.2.2) | | [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.17.0](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.17.0) | | [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.0.2](https://github.com/GEOS-ESM/MOM6/releases/tag/geos%2Fv2.0.2) | diff --git a/components.yaml b/components.yaml index bcc28cd9..f0172e1d 100644 --- a/components.yaml +++ b/components.yaml @@ -73,7 +73,7 @@ GEOSchem_GridComp: HEMCO: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/Shared/HEMCO/@HEMCO remote: ../HEMCO.git - tag: geos/v2.2.1 + tag: geos/v2.2.2 develop: geos/develop geos-chem: From 3c01a60cdee36fb607b0e16ec643161c585b5a5d Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 18 Feb 2022 15:23:38 -0500 Subject: [PATCH 26/28] Move to GOCART 2.0.4 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 318a2c2d..6a6403d3 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ | [GEOSgcm_GridComp](https://github.com/GEOS-ESM/GEOSgcm_GridComp) | [v1.14.1](https://github.com/GEOS-ESM/GEOSgcm_GridComp/releases/tag/v1.14.1) | | [GFDL_atmos_cubed_sphere](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere) | [geos/v1.3.0](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere/releases/tag/geos%2Fv1.3.0) | | [GMAO_Shared](https://github.com/GEOS-ESM/GMAO_Shared) | [v1.5.1](https://github.com/GEOS-ESM/GMAO_Shared/releases/tag/v1.5.1) | -| [GOCART](https://github.com/GEOS-ESM/GOCART) | [v2.0.3](https://github.com/GEOS-ESM/GOCART/releases/tag/v2.0.3) | +| [GOCART](https://github.com/GEOS-ESM/GOCART) | [v2.0.4](https://github.com/GEOS-ESM/GOCART/releases/tag/v2.0.4) | | [HEMCO](https://github.com/GEOS-ESM/HEMCO) | [geos/v2.2.2](https://github.com/GEOS-ESM/HEMCO/releases/tag/geos%2Fv2.2.2) | | [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.17.0](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.17.0) | | [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) | diff --git a/components.yaml b/components.yaml index f0172e1d..ea5f8feb 100644 --- a/components.yaml +++ b/components.yaml @@ -85,7 +85,7 @@ geos-chem: GOCART: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@GOCART remote: ../GOCART.git - tag: v2.0.3 + tag: v2.0.4 develop: develop mom: From 49b1fba0ade96927d7411d10f0672e975840353f Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 18 Feb 2022 15:23:58 -0500 Subject: [PATCH 27/28] Move to MAPL 2.17.2 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6a6403d3..04cfb4e4 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ | [GMAO_Shared](https://github.com/GEOS-ESM/GMAO_Shared) | [v1.5.1](https://github.com/GEOS-ESM/GMAO_Shared/releases/tag/v1.5.1) | | [GOCART](https://github.com/GEOS-ESM/GOCART) | [v2.0.4](https://github.com/GEOS-ESM/GOCART/releases/tag/v2.0.4) | | [HEMCO](https://github.com/GEOS-ESM/HEMCO) | [geos/v2.2.2](https://github.com/GEOS-ESM/HEMCO/releases/tag/geos%2Fv2.2.2) | -| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.17.0](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.17.0) | +| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.17.2](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.17.2) | | [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.0.2](https://github.com/GEOS-ESM/MOM6/releases/tag/geos%2Fv2.0.2) | | [RRTMGP](https://github.com/GEOS-ESM/rte-rrtmgp) | [geos/v1.5+1.0.0](https://github.com/GEOS-ESM/rte-rrtmgp/releases/tag/geos%2Fv1.5%2B1.0.0) diff --git a/components.yaml b/components.yaml index ea5f8feb..97d2b5d8 100644 --- a/components.yaml +++ b/components.yaml @@ -36,7 +36,7 @@ GMAO_Shared: MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - tag: v2.17.0 + tag: v2.17.2 develop: develop FMS: From af54eb9bca3ce8a2dbef82bc660e1f01db9bbd3e Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 18 Feb 2022 15:26:16 -0500 Subject: [PATCH 28/28] Update to GEOSgcm_GridComp v1.15.0 and GEOSgcm_App v1.7.0 --- README.md | 4 ++-- components.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 04cfb4e4..3a4def1b 100644 --- a/README.md +++ b/README.md @@ -20,8 +20,8 @@ | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v1.6.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v1.6.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) | | [GEOSchem_GridComp](https://github.com/GEOS-ESM/GEOSchem_GridComp) | [v1.8.0](https://github.com/GEOS-ESM/GEOSchem_GridComp/releases/tag/v1.8.0) | -| [GEOSgcm_App](https://github.com/GEOS-ESM/GEOSgcm_App) | [v1.6.2](https://github.com/GEOS-ESM/GEOSgcm_App/releases/tag/v1.6.1) | -| [GEOSgcm_GridComp](https://github.com/GEOS-ESM/GEOSgcm_GridComp) | [v1.14.1](https://github.com/GEOS-ESM/GEOSgcm_GridComp/releases/tag/v1.14.1) | +| [GEOSgcm_App](https://github.com/GEOS-ESM/GEOSgcm_App) | [v1.7.0](https://github.com/GEOS-ESM/GEOSgcm_App/releases/tag/v1.7.0) | +| [GEOSgcm_GridComp](https://github.com/GEOS-ESM/GEOSgcm_GridComp) | [v1.15.0](https://github.com/GEOS-ESM/GEOSgcm_GridComp/releases/tag/v1.15.0) | | [GFDL_atmos_cubed_sphere](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere) | [geos/v1.3.0](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere/releases/tag/geos%2Fv1.3.0) | | [GMAO_Shared](https://github.com/GEOS-ESM/GMAO_Shared) | [v1.5.1](https://github.com/GEOS-ESM/GMAO_Shared/releases/tag/v1.5.1) | | [GOCART](https://github.com/GEOS-ESM/GOCART) | [v2.0.4](https://github.com/GEOS-ESM/GOCART/releases/tag/v2.0.4) | diff --git a/components.yaml b/components.yaml index 97d2b5d8..afdbc9f4 100644 --- a/components.yaml +++ b/components.yaml @@ -48,7 +48,7 @@ FMS: GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - branch: feature/#328/geos-v10.19.4/gocart2g + tag: v1.15.0 sparse: ./config/GEOSgcm_GridComp.sparse develop: develop @@ -111,7 +111,7 @@ RRTMGP: GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git - branch: feature/#328/geos-v10.17.6/gocart2g/new-extdata + tag: v1.7.0 develop: develop UMD_Etc: