From 514c85fe13b75d986a234e18a53741913cae4bc3 Mon Sep 17 00:00:00 2001 From: Santha Akella Date: Thu, 9 Jul 2020 14:16:13 -0400 Subject: [PATCH 1/5] To add MOM6 --- components.yaml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/components.yaml b/components.yaml index 6d0fa32c..91f7a59d 100644 --- a/components.yaml +++ b/components.yaml @@ -44,8 +44,8 @@ FMS: GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - tag: v1.9.0 - develop: develop + branch : feature/sanAkel/final-stress-rebase-with-develop-2020Jun16 + develop: feature/sanAkel/final-stress-rebase-with-develop-2020Jun16 FVdycoreCubed_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp @@ -71,11 +71,17 @@ mom: tag: geos/v1.0.3 develop: geos5 +mom6: + local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/GEOSocean_GridComp/GuestOcean_GridComp/MOM6_GEOSPlug/@mom6 + remote: ../MOM6.git + tag: geos/v1.0.0 + recurse_submodules: True + GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git - tag: v1.3.5 - develop: develop + branch: final-stress-rebase-with-develop-2020Jun16 + develop: final-stress-rebase-with-develop-2020Jun16 UMD_Etc: local: ./src/Applications/@UMD_Etc From ca562a34d752c817734f03aa4bbaddbd0be464e9 Mon Sep 17 00:00:00 2001 From: Santha Akella Date: Thu, 9 Jul 2020 14:34:03 -0400 Subject: [PATCH 2/5] MOM5 has to be built as a shared library, just like MOM6. Again, this lets the user choose between either ocean models: MOM5 or MOM6 at run time --- components.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components.yaml b/components.yaml index 91f7a59d..dd496116 100644 --- a/components.yaml +++ b/components.yaml @@ -68,8 +68,8 @@ GEOSchem_GridComp: mom: local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/GEOSocean_GridComp/GuestOcean_GridComp/MOM_GEOS5PlugMod/@mom remote: ../MOM5.git - tag: geos/v1.0.3 - develop: geos5 + branch: feature/sanAkel/add-MOM6 + develop: feature/sanAkel/add-MOM6 mom6: local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/GEOSocean_GridComp/GuestOcean_GridComp/MOM6_GEOSPlug/@mom6 From c17217441a08c2ab9e21dfa11dc1354436d679e7 Mon Sep 17 00:00:00 2001 From: Santha Akella Date: Thu, 9 Jul 2020 16:10:46 -0400 Subject: [PATCH 3/5] Fix develop to be develop and use a tagged version of MOM5 --- components.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/components.yaml b/components.yaml index dd496116..4ab1cfa3 100644 --- a/components.yaml +++ b/components.yaml @@ -45,7 +45,7 @@ GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git branch : feature/sanAkel/final-stress-rebase-with-develop-2020Jun16 - develop: feature/sanAkel/final-stress-rebase-with-develop-2020Jun16 + develop: develop FVdycoreCubed_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp @@ -68,20 +68,21 @@ GEOSchem_GridComp: mom: local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/GEOSocean_GridComp/GuestOcean_GridComp/MOM_GEOS5PlugMod/@mom remote: ../MOM5.git - branch: feature/sanAkel/add-MOM6 - develop: feature/sanAkel/add-MOM6 + tag: geos/5.1.0+1.1.0 + develop: geos5 mom6: local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/GEOSocean_GridComp/GuestOcean_GridComp/MOM6_GEOSPlug/@mom6 remote: ../MOM6.git tag: geos/v1.0.0 + develop: geos recurse_submodules: True GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git branch: final-stress-rebase-with-develop-2020Jun16 - develop: final-stress-rebase-with-develop-2020Jun16 + develop: develop UMD_Etc: local: ./src/Applications/@UMD_Etc From 22977bcff959dc89030a11ef307979578d8db112 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 17 Jul 2020 14:57:39 -0400 Subject: [PATCH 4/5] Update to GEOSgcm_App v1.3.6 --- Externals.cfg | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index 4405eb5e..e8e81632 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -56,7 +56,7 @@ sparse = ../../../config/GEOSgcm_GridComp.sparse required = True repo_url = git@github.com:GEOS-ESM/GEOSgcm_App.git local_path = ./src/Applications/@GEOSgcm_App -tag = v1.3.5 +tag = v1.3.6 protocol = git [UMD_Etc] diff --git a/components.yaml b/components.yaml index acf639c0..6c9f4eb3 100644 --- a/components.yaml +++ b/components.yaml @@ -82,7 +82,7 @@ mom6: GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git - branch: final-stress-rebase-with-develop-2020Jun16 + tag: v1.3.6 develop: develop UMD_Etc: From 8c7e61492ac2f34f1b0b5a0b981eccff6048f4b5 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 17 Jul 2020 15:15:33 -0400 Subject: [PATCH 5/5] Update to GEOSgcm_GridComp v1.10.0 --- Externals.cfg | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index e8e81632..df678efe 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -47,7 +47,7 @@ protocol = git required = True repo_url = git@github.com:GEOS-ESM/GEOSgcm_GridComp.git local_path = ./src/Components/@GEOSgcm_GridComp -tag = v1.9.0 +tag = v1.10.0 protocol = git externals = Externals.cfg sparse = ../../../config/GEOSgcm_GridComp.sparse diff --git a/components.yaml b/components.yaml index 6c9f4eb3..b37700dc 100644 --- a/components.yaml +++ b/components.yaml @@ -44,7 +44,7 @@ FMS: GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - branch: feature/sanAkel/final-stress-rebase-with-develop-2020Jun16 + tag: v1.10.0 sparse: ./config/GEOSgcm_GridComp.sparse develop: develop