From 4dfe360ec31c97be6900883776cc8ffcffb9dafa Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 27 Apr 2023 08:46:16 -0400 Subject: [PATCH 1/5] Move MAM, MATRIX, DNA to separate repos --- README.md | 3 +++ components.yaml | 20 +++++++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 53f04708..0c296cad 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,7 @@ | ---------- | ------- | | [CICE](https://github.com/GEOS-ESM/CICE) | [geos/v0.0.1](https://github.com/GEOS-ESM/CICE/releases/tag/geos%2Fv0.0.1) | | [CPLFCST_Etc](https://github.com/GEOS-ESM/CPLFCST_Etc) | [v1.0.1](https://github.com/GEOS-ESM/CPLFCST_Etc/releases/tag/v1.0.1) | +| [DNA](https://github.com/GEOS-ESM/DNA) | [v1.0.0](https://github.com/GEOS-ESM/DNA/releases/tag/v1.0.0) | | [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.28.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v3.28.0) | | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v4.9.1](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v4.9.1) | @@ -31,7 +32,9 @@ | [GMAO_Shared](https://github.com/GEOS-ESM/GMAO_Shared) | [v1.8.0](https://github.com/GEOS-ESM/GMAO_Shared/releases/tag/v1.8.0) | | [GOCART](https://github.com/GEOS-ESM/GOCART) | [sdr_v2.1.2.2](https://github.com/GEOS-ESM/GOCART/releases/tag/sdr_v2.1.2.2) | | [HEMCO](https://github.com/GEOS-ESM/HEMCO) | [geos/v2.2.3](https://github.com/GEOS-ESM/HEMCO/releases/tag/geos%2Fv2.2.3) | +| [MAM](https://github.com/GEOS-ESM/MAM) | [v1.0.0](https://github.com/GEOS-ESM/MAM/releases/tag/v1.0.0) | | [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.36.0](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.36.0) | +| [MATRIX](https://github.com/GEOS-ESM/MATRIX) | [v1.0.0](https://github.com/GEOS-ESM/MATRIX/releases/tag/v1.0.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.1.0](https://github.com/GEOS-ESM/MOM6/tree/geos/v2.1.0) | | [NCEP_Shared](https://github.com/GEOS-ESM/NCEP_Shared) | [v1.2.1](https://github.com/GEOS-ESM/NCEP_Shared/releases/tag/v1.2.1) | diff --git a/components.yaml b/components.yaml index 8c2df72b..c812d3d4 100644 --- a/components.yaml +++ b/components.yaml @@ -73,7 +73,7 @@ fvdycore: GEOSchem_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp remote: ../GEOSchem_GridComp.git - tag: v1.12.0 + branch: feature/mathomp4/separate-dna-mam-matrix develop: develop HEMCO: @@ -118,6 +118,24 @@ StratChem: tag: v1.0.0 develop: develop +MAM: + local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@MAM + remote: ../MAM.git + branch: main + develop: main + +MATRIX: + local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@MATRIX + remote: ../MATRIX.git + branch: main + develop: main + +DNA: + local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@DNA + remote: ../DNA.git + branch: main + develop: main + GEOS_OceanGridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp remote: ../GEOS_OceanGridComp.git From 78b51a834764bc6bec1b7c0e13cdc4a316d60ace Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 25 May 2023 07:49:57 -0400 Subject: [PATCH 2/5] Add CARMA, GAAS, and GEOSachem repos --- README.md | 3 +++ components.yaml | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/README.md b/README.md index d29b595f..2a0fa32e 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,7 @@ | Repository | Version | | ---------- | ------- | +| [CARMA](https://github.com/GEOS-ESM/CARMA) | [v1.0.0](https://github.com/GEOS-ESM/CARMA/releases/tag/v1.0.0) | | [CICE](https://github.com/GEOS-ESM/CICE) | [geos/v0.0.1](https://github.com/GEOS-ESM/CICE/releases/tag/geos%2Fv0.0.1) | | [CPLFCST_Etc](https://github.com/GEOS-ESM/CPLFCST_Etc) | [v1.0.1](https://github.com/GEOS-ESM/CPLFCST_Etc/releases/tag/v1.0.1) | | [DNA](https://github.com/GEOS-ESM/DNA) | [v1.0.0](https://github.com/GEOS-ESM/DNA/releases/tag/v1.0.0) | @@ -20,9 +21,11 @@ | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v4.9.2](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v4.9.2) | | [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.3.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.3.0) | +| [GAAS](https://github.com/GEOS-ESM/GAAS) | [v1.0.0](https://github.com/GEOS-ESM/GAAS/releases/tag/v1.0.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) | | [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v2.1.0](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v2.1.0) | | [GEOS_Util](https://github.com/GEOS-ESM/GEOS_Util) | [v2.0.0](https://github.com/GEOS-ESM/GEOS_Util/releases/tag/v2.0.0) | +| [GEOSachem](https://github.com/GEOS-ESM/GEOSachem) | [v1.0.0](https://github.com/GEOS-ESM/GEOSachem/releases/tag/v1.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.2](https://github.com/GEOS-ESM/GEOSgcm_App/releases/tag/v2.1.2) | | [GEOSgcm_GridComp](https://github.com/GEOS-ESM/GEOSgcm_GridComp) | [v2.1.1](https://github.com/GEOS-ESM/GEOSgcm_GridComp/releases/tag/v2.1.1) | diff --git a/components.yaml b/components.yaml index 6e0ef144..6451903a 100644 --- a/components.yaml +++ b/components.yaml @@ -136,6 +136,24 @@ DNA: branch: main develop: main +CARMA: + local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@CARMA + remote: ../CARMA.git + branch: main + develop: main + +GAAS: + local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@GAAS + remote: ../GAAS.git + branch: main + develop: main + +GEOSachem: + local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@GEOSachem + remote: ../GEOSachem.git + branch: main + develop: main + GEOS_OceanGridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp remote: ../GEOS_OceanGridComp.git From cb6096a8cd38d62649da1494d270e21f64b6269f Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 25 May 2023 09:23:01 -0400 Subject: [PATCH 3/5] Fix develop branches --- components.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components.yaml b/components.yaml index 6451903a..c1043ab0 100644 --- a/components.yaml +++ b/components.yaml @@ -140,19 +140,19 @@ CARMA: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@CARMA remote: ../CARMA.git branch: main - develop: main + develop: develop GAAS: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@GAAS remote: ../GAAS.git branch: main - develop: main + develop: develop GEOSachem: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@GEOSachem remote: ../GEOSachem.git branch: main - develop: main + develop: develop GEOS_OceanGridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp From 0b0ac2deba1653981b427456935d943984ecbb64 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 25 Aug 2023 08:40:55 -0400 Subject: [PATCH 4/5] Use tags for new repos --- components.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/components.yaml b/components.yaml index ad4621f9..76828210 100644 --- a/components.yaml +++ b/components.yaml @@ -121,37 +121,37 @@ StratChem: MAM: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@MAM remote: ../MAM.git - branch: main + tag: v1.0.0 develop: main MATRIX: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@MATRIX remote: ../MATRIX.git - branch: main + tag: v1.0.0 develop: main DNA: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@DNA remote: ../DNA.git - branch: main + tag: v1.0.0 develop: main CARMA: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@CARMA remote: ../CARMA.git - branch: main + tag: v1.0.0 develop: develop GAAS: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@GAAS remote: ../GAAS.git - branch: main + tag: v1.0.0 develop: develop GEOSachem: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@GEOSachem remote: ../GEOSachem.git - branch: main + tag: v1.0.0 develop: develop GEOS_OceanGridComp: From 04da66942b015b6fb455b62c4dde456a8b3d8353 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 16 May 2024 12:36:39 -0400 Subject: [PATCH 5/5] Update GAAS and CARMA --- README.md | 4 ++-- components.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1ec6cf0e..b5da0f11 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ | Repository | Version | | ---------- | ------- | -| [CARMA](https://github.com/GEOS-ESM/CARMA) | [v1.0.0](https://github.com/GEOS-ESM/CARMA/releases/tag/v1.0.0) | +| [CARMA](https://github.com/GEOS-ESM/CARMA) | [v1.1.0](https://github.com/GEOS-ESM/CARMA/releases/tag/v1.1.0) | | [CICE](https://github.com/GEOS-ESM/CICE) | [geos/v0.1.3](https://github.com/GEOS-ESM/CICE/releases/tag/geos%2Fv0.1.3) | | [CPLFCST_Etc](https://github.com/GEOS-ESM/CPLFCST_Etc) | [v1.0.1](https://github.com/GEOS-ESM/CPLFCST_Etc/releases/tag/v1.0.1) | | [DNA](https://github.com/GEOS-ESM/DNA) | [v1.0.0](https://github.com/GEOS-ESM/DNA/releases/tag/v1.0.0) | @@ -23,7 +23,7 @@ | [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v4.29.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v4.29.0) | | [FMS](https://github.com/GEOS-ESM/FMS) | [geos/2019.01.02+noaff.10](https://github.com/GEOS-ESM/FMS/releases/tag/geos%2F2019.01.02%2Bnoaff.10) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.11.1](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.11.1) | -| [GAAS](https://github.com/GEOS-ESM/GAAS) | [v1.0.0](https://github.com/GEOS-ESM/GAAS/releases/tag/v1.0.0) | +| [GAAS](https://github.com/GEOS-ESM/GAAS) | [v1.1.0](https://github.com/GEOS-ESM/GAAS/releases/tag/v1.1.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) | | [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v2.1.6](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v2.1.6) | | [GEOS_Util](https://github.com/GEOS-ESM/GEOS_Util) | [v2.0.8](https://github.com/GEOS-ESM/GEOS_Util/releases/tag/v2.0.8) | diff --git a/components.yaml b/components.yaml index 009cc60a..4f4a0274 100644 --- a/components.yaml +++ b/components.yaml @@ -139,13 +139,13 @@ DNA: CARMA: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@CARMA remote: ../CARMA.git - tag: v1.0.0 + tag: v1.1.0 develop: develop GAAS: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@GAAS remote: ../GAAS.git - tag: v1.0.0 + tag: v1.1.0 develop: develop GEOSachem: