From 208a45cdf8a4ce19841fbfac1ce042701d6ab67c Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 11 Apr 2024 13:20:35 -0400 Subject: [PATCH 1/3] Move GEOSgcm_GridComp under Components in GEOSldas Currently, GEOSgcm_GridComp is cloned via mepo under GEOSldas_GridComp (which echoes how it was in in GEOSldas v17 and older). This PR moves GEOSgcm_GridComp under Components in GEOSldas. This makes its location consistent with GEOSgcm and GEOSldas. Note that this PR requires a corresponding change in the XXX repo: --- components.yaml | 2 +- src/Components/.gitignore | 3 +++ src/Components/CMakeLists.txt | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index 35f02de8..a0c07b76 100644 --- a/components.yaml +++ b/components.yaml @@ -53,7 +53,7 @@ GEOSldas_GridComp: develop: develop GEOSgcm_GridComp: - local: ./src/Components/@GEOSldas_GridComp/@GEOSgcm_GridComp + local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git branch: develop sparse: ./config/GEOSgcm_GridComp_ldas.sparse diff --git a/src/Components/.gitignore b/src/Components/.gitignore index afe16bcd..edbdf747 100644 --- a/src/Components/.gitignore +++ b/src/Components/.gitignore @@ -1,3 +1,6 @@ /@GEOSldas_GridComp /GEOSldas_GridComp /GEOSldas_GridComp@ +/@GEOSgcm_GridComp +/GEOSgcm_GridComp +/GEOSgcm_GridComp@ diff --git a/src/Components/CMakeLists.txt b/src/Components/CMakeLists.txt index 4ad9bf41..68e9c7e0 100644 --- a/src/Components/CMakeLists.txt +++ b/src/Components/CMakeLists.txt @@ -1 +1,2 @@ esma_add_subdirectory (GEOSldas_GridComp) +esma_add_subdirectory (GEOSgcm_GridComp) From 2e1d12db1ba15c2a3e3af752b1095389358fa804 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 11 Apr 2024 13:22:16 -0400 Subject: [PATCH 2/3] Update components.yaml --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index a0c07b76..19ce8707 100644 --- a/components.yaml +++ b/components.yaml @@ -49,7 +49,7 @@ MAPL: GEOSldas_GridComp: local: ./src/Components/@GEOSldas_GridComp remote: ../GEOSldas_GridComp.git - branch: develop + branch: feature/mathomp4/move-gcmgc-ldas develop: develop GEOSgcm_GridComp: From 775da9578562e641fc780220a1e0c8e02f90298d Mon Sep 17 00:00:00 2001 From: Rolf Reichle <54944691+gmao-rreichle@users.noreply.github.com> Date: Thu, 11 Apr 2024 14:43:29 -0400 Subject: [PATCH 3/3] Update components.yaml --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index 19ce8707..a0c07b76 100644 --- a/components.yaml +++ b/components.yaml @@ -49,7 +49,7 @@ MAPL: GEOSldas_GridComp: local: ./src/Components/@GEOSldas_GridComp remote: ../GEOSldas_GridComp.git - branch: feature/mathomp4/move-gcmgc-ldas + branch: develop develop: develop GEOSgcm_GridComp: