From 16049938f6f7f2e248d0ac2a71aa09ae80c84503 Mon Sep 17 00:00:00 2001 From: Weiyuan Jiang Date: Fri, 30 Sep 2022 10:24:24 -0400 Subject: [PATCH 01/16] branch off v10.23.0 and checkout gigatraj --- components.yaml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index dde44edd..b98cfafd 100644 --- a/components.yaml +++ b/components.yaml @@ -48,7 +48,8 @@ FMS: GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - tag: v1.17.0 + branch: feature/wjiang/GEOS_GigaTraj + #tag: v1.17.0 sparse: ./config/GEOSgcm_GridComp.sparse develop: develop @@ -156,3 +157,10 @@ CPLFCST_Etc: remote: ../CPLFCST_Etc.git tag: v1.0.1 develop: main + +GigaTraj: + local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GigaTraj_GridComp/@GigaTraj + remote: ../../GSFC-587/GigaTraj.git + branch: main + develop: develop + From 6e90e279021501f94531002124bf2a7d609ad430 Mon Sep 17 00:00:00 2001 From: Weiyuan Jiang Date: Fri, 30 Sep 2022 10:44:08 -0400 Subject: [PATCH 02/16] fix remote --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index b98cfafd..dfec2ae9 100644 --- a/components.yaml +++ b/components.yaml @@ -160,7 +160,7 @@ CPLFCST_Etc: GigaTraj: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GigaTraj_GridComp/@GigaTraj - remote: ../../GSFC-587/GigaTraj.git + remote: git@github.com:GSFC-587/GigaTraj.git branch: main develop: develop From 67112f52d2bcdafee599d46b993bf67070477c97 Mon Sep 17 00:00:00 2001 From: Weiyuan Jiang Date: Fri, 30 Sep 2022 16:28:27 -0400 Subject: [PATCH 03/16] change to gigatraj develop branch --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index dfec2ae9..fed4408e 100644 --- a/components.yaml +++ b/components.yaml @@ -161,6 +161,6 @@ CPLFCST_Etc: GigaTraj: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GigaTraj_GridComp/@GigaTraj remote: git@github.com:GSFC-587/GigaTraj.git - branch: main + branch: develop develop: develop From 2b2674c38f1cbb7932f35ff64a0c49e17250d33f Mon Sep 17 00:00:00 2001 From: Weiyuan Jiang Date: Mon, 3 Oct 2022 14:25:33 -0400 Subject: [PATCH 04/16] change location of gigatraj --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index fed4408e..e33a1302 100644 --- a/components.yaml +++ b/components.yaml @@ -159,7 +159,7 @@ CPLFCST_Etc: develop: main GigaTraj: - local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GigaTraj_GridComp/@GigaTraj + local: ./src/Components/@GEOSgcm_GridComp/GigaTraj_GridComp/@GigaTraj remote: git@github.com:GSFC-587/GigaTraj.git branch: develop develop: develop From c19d3736f7d86f7c28d9e82ea634f664ddc3ce3e Mon Sep 17 00:00:00 2001 From: Weiyuan Jiang Date: Thu, 19 Jan 2023 09:30:36 -0500 Subject: [PATCH 05/16] change GEOSgcm_App's version --- components.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index e33a1302..541d4494 100644 --- a/components.yaml +++ b/components.yaml @@ -143,7 +143,8 @@ RRTMGP: GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git - tag: v1.8.0 + branch: feature/wjiang/GEOS_GigaTraj + #tag: v1.8.0 develop: develop UMD_Etc: From 0ffcb7fafd4043e90619e83b98d244749e6efd52 Mon Sep 17 00:00:00 2001 From: Weiyuan Jiang Date: Tue, 28 Feb 2023 14:43:35 -0500 Subject: [PATCH 06/16] update MAPL version --- components.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index 541d4494..f0820943 100644 --- a/components.yaml +++ b/components.yaml @@ -36,7 +36,8 @@ GMAO_Shared: MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - tag: v2.25.0 + #tag: v2.25.0 + branch: feature/wjiang/GEOS_GigaTraj develop: develop FMS: From f4d209cbff8133aebc4005f400252f117ab93e30 Mon Sep 17 00:00:00 2001 From: Weiyuan Jiang Date: Tue, 14 Mar 2023 15:31:04 -0400 Subject: [PATCH 07/16] rename to GEOSgigatraj_GridComp --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index f0820943..6ad75cbc 100644 --- a/components.yaml +++ b/components.yaml @@ -161,7 +161,7 @@ CPLFCST_Etc: develop: main GigaTraj: - local: ./src/Components/@GEOSgcm_GridComp/GigaTraj_GridComp/@GigaTraj + local: ./src/Components/@GEOSgcm_GridComp/GEOSgigatraj_GridComp/@GigaTraj remote: git@github.com:GSFC-587/GigaTraj.git branch: develop develop: develop From c0e656846a65dde89b5c2862905496f2ad9cd3be Mon Sep 17 00:00:00 2001 From: Weiyuan Jiang Date: Tue, 24 Oct 2023 14:06:38 -0400 Subject: [PATCH 08/16] change components --- components.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/components.yaml b/components.yaml index 6ad75cbc..6d75ef38 100644 --- a/components.yaml +++ b/components.yaml @@ -5,7 +5,7 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v4.4.0 + tag: v4.8.0 develop: main cmake: @@ -36,8 +36,8 @@ GMAO_Shared: MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - #tag: v2.25.0 - branch: feature/wjiang/GEOS_GigaTraj + tag: v2.38.0 + #branch: feature/wjiang/GEOS_GigaTraj develop: develop FMS: @@ -49,8 +49,8 @@ FMS: GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - branch: feature/wjiang/GEOS_GigaTraj - #tag: v1.17.0 + #branch: feature/wjiang/GEOS_GigaTraj + tag: geos_gigatraj sparse: ./config/GEOSgcm_GridComp.sparse develop: develop From bfb187d8f960524e5e6f1226b6d797c5d59cd237 Mon Sep 17 00:00:00 2001 From: Weiyuan Jiang Date: Tue, 24 Oct 2023 14:16:24 -0400 Subject: [PATCH 09/16] change branch gigatraj to tag --- components.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index 6d75ef38..30e08adf 100644 --- a/components.yaml +++ b/components.yaml @@ -163,6 +163,7 @@ CPLFCST_Etc: GigaTraj: local: ./src/Components/@GEOSgcm_GridComp/GEOSgigatraj_GridComp/@GigaTraj remote: git@github.com:GSFC-587/GigaTraj.git - branch: develop + tag: geos_gigatraj + #branch: develop develop: develop From 4c36585fccdaa75d3c7e533a8a0b964afeaf8142 Mon Sep 17 00:00:00 2001 From: Weiyuan Jiang Date: Fri, 3 Nov 2023 14:31:50 -0400 Subject: [PATCH 10/16] change components --- components.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components.yaml b/components.yaml index 30e08adf..2f3203c4 100644 --- a/components.yaml +++ b/components.yaml @@ -36,7 +36,7 @@ GMAO_Shared: MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - tag: v2.38.0 + tag: geos_gigatraj #branch: feature/wjiang/GEOS_GigaTraj develop: develop @@ -144,8 +144,8 @@ RRTMGP: GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git - branch: feature/wjiang/GEOS_GigaTraj - #tag: v1.8.0 + # branch: feature/wjiang/GEOS_GigaTraj + tag: geos_gigatraj develop: develop UMD_Etc: From 4d2e311deb7c03e7f6050993ed701a3f4219e7fd Mon Sep 17 00:00:00 2001 From: Weiyuan Jiang Date: Sun, 27 Oct 2024 21:44:30 -0400 Subject: [PATCH 11/16] update env --- components.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components.yaml b/components.yaml index 5415698e..4456500d 100644 --- a/components.yaml +++ b/components.yaml @@ -5,7 +5,7 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v4.8.0 + tag: v4.29.0 develop: main cmake: @@ -208,8 +208,8 @@ CPLFCST_Etc: GigaTraj: local: ./src/Components/@GEOSgcm_GridComp/GEOSgigatraj_GridComp/@GigaTraj - remote: git@github.com:GSFC-587/GigaTraj.git + remote: git@github.com:nasa/gigatraj.git #tag: geos_gigatraj - branch: develop + branch: develop-GSFC develop: develop From cdcebaac446e65212d8b9330783ae72d59d34e5b Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 13 Dec 2024 11:11:35 -0500 Subject: [PATCH 12/16] Update to gigatraj geos/v1.0.0 --- README.md | 1 + components.yaml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9ab53c42..649f5905 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,7 @@ | [GEOSgcm_GridComp](https://github.com/GEOS-ESM/GEOSgcm_GridComp) | [v2.6.2](https://github.com/GEOS-ESM/GEOSgcm_GridComp/releases/tag/v2.6.2) | | [GEOSradiation_GridComp](https://github.com/GEOS-ESM/GEOSradiation_GridComp) | [v1.10.0](https://github.com/GEOS-ESM/GEOSradiation_GridComp/releases/tag/v1.10.0) | | [GFDL_atmos_cubed_sphere](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere) | [geos/v2.9.1](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere/releases/tag/geos%2Fv2.9.1) | +| [gigatraj](https://github.com/GEOS-ESM/gigatraj) | [geos/v1.0.0](https://github.com/GEOS-ESM/gigatraj/releases/tag/geos%2Fv1.0.0) | | [GMI](https://github.com/GEOS-ESM/GMI) | [v1.3.0](https://github.com/GEOS-ESM/GMI/releases/tag/v1.3.0) | | [GMAO_Shared](https://github.com/GEOS-ESM/GMAO_Shared) | [v1.9.9](https://github.com/GEOS-ESM/GMAO_Shared/releases/tag/v1.9.9) | | [GOCART](https://github.com/GEOS-ESM/GOCART) | [sdr_v2.2.1.2](https://github.com/GEOS-ESM/GOCART/releases/tag/sdr_v2.2.1.2) | diff --git a/components.yaml b/components.yaml index 993a0f00..34e25897 100644 --- a/components.yaml +++ b/components.yaml @@ -63,8 +63,8 @@ GEOSgcm_GridComp: GigaTraj: local: ./src/Components/@GEOSgcm_GridComp/GEOSgigatraj_GridComp/@GigaTraj remote: ../gigatraj.git - branch: develop-GSFC - develop: develop + tag: geos/v1.0.0 + develop: develop-GSFC FVdycoreCubed_GridComp: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp From 8151043f3ada33c84c1851f4a3b53d9922e03609 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 6 Jan 2025 15:59:47 -0500 Subject: [PATCH 13/16] Add commented tags --- components.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/components.yaml b/components.yaml index 2bdeb536..e0220d95 100644 --- a/components.yaml +++ b/components.yaml @@ -56,7 +56,8 @@ FMS: GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - branch: feature/wjiang/GEOS_GigaTraj + #tag: v2.6.3 + branch: develop sparse: ./config/GEOSgcm_GridComp.sparse develop: develop @@ -197,7 +198,8 @@ umwm: GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git - branch: feature/wjiang/GEOS_GigaTraj + #tag: v2.3.6 + branch: develop develop: develop UMD_Etc: From 52c3bdfc3a90aba9388b823169d453adff5e1c4a Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst <53346946+sdrabenh@users.noreply.github.com> Date: Thu, 9 Jan 2025 16:20:52 -0500 Subject: [PATCH 14/16] Update components.yaml --- components.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components.yaml b/components.yaml index e0220d95..b8356327 100644 --- a/components.yaml +++ b/components.yaml @@ -56,7 +56,7 @@ FMS: GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - #tag: v2.6.3 + tag: v2.6.4 branch: develop sparse: ./config/GEOSgcm_GridComp.sparse develop: develop @@ -198,7 +198,7 @@ umwm: GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git - #tag: v2.3.6 + tag: v2.3.7 branch: develop develop: develop From ec27776078b1670425daa0c4a225bea41c787488 Mon Sep 17 00:00:00 2001 From: Scott Rabenhorst <53346946+sdrabenh@users.noreply.github.com> Date: Thu, 9 Jan 2025 16:22:30 -0500 Subject: [PATCH 15/16] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f12d7bc0..5632ac91 100644 --- a/README.md +++ b/README.md @@ -23,8 +23,8 @@ | [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v2.3.0](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v2.3.0) | | [GEOS_Util](https://github.com/GEOS-ESM/GEOS_Util) | [v2.1.3](https://github.com/GEOS-ESM/GEOS_Util/releases/tag/v2.1.3) | | [GEOSchem_GridComp](https://github.com/GEOS-ESM/GEOSchem_GridComp) | [v1.14.0](https://github.com/GEOS-ESM/GEOSchem_GridComp/releases/tag/v1.14.0) | -| [GEOSgcm_App](https://github.com/GEOS-ESM/GEOSgcm_App) | [v2.3.5](https://github.com/GEOS-ESM/GEOSgcm_App/releases/tag/v2.3.5) | -| [GEOSgcm_GridComp](https://github.com/GEOS-ESM/GEOSgcm_GridComp) | [v2.6.2](https://github.com/GEOS-ESM/GEOSgcm_GridComp/releases/tag/v2.6.2) | +| [GEOSgcm_App](https://github.com/GEOS-ESM/GEOSgcm_App) | [v2.3.7](https://github.com/GEOS-ESM/GEOSgcm_App/releases/tag/v2.3.7) | +| [GEOSgcm_GridComp](https://github.com/GEOS-ESM/GEOSgcm_GridComp) | [v2.6.4](https://github.com/GEOS-ESM/GEOSgcm_GridComp/releases/tag/v2.6.4) | | [GEOSradiation_GridComp](https://github.com/GEOS-ESM/GEOSradiation_GridComp) | [v1.10.0](https://github.com/GEOS-ESM/GEOSradiation_GridComp/releases/tag/v1.10.0) | | [GFDL_atmos_cubed_sphere](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere) | [geos/v2.9.1](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere/releases/tag/geos%2Fv2.9.1) | | [gigatraj](https://github.com/GEOS-ESM/gigatraj) | [geos/v1.0.0](https://github.com/GEOS-ESM/gigatraj/releases/tag/geos%2Fv1.0.0) | From bbdb3b9193f1f6edb987839f8407a9679aeb49a1 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 9 Jan 2025 16:29:50 -0500 Subject: [PATCH 16/16] Fix up components --- components.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/components.yaml b/components.yaml index b8356327..f4d4d8aa 100644 --- a/components.yaml +++ b/components.yaml @@ -57,7 +57,6 @@ GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git tag: v2.6.4 - branch: develop sparse: ./config/GEOSgcm_GridComp.sparse develop: develop @@ -199,7 +198,6 @@ GEOSgcm_App: local: ./src/Applications/@GEOSgcm_App remote: ../GEOSgcm_App.git tag: v2.3.7 - branch: develop develop: develop UMD_Etc: