From 4f5132465e5cb59d6098de1cc776b1844fecd16f Mon Sep 17 00:00:00 2001 From: Rolf Reichle Date: Wed, 10 Apr 2024 16:55:03 -0400 Subject: [PATCH 1/5] updated components.yaml in prep for release v18.0.2 --- components.yaml | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/components.yaml b/components.yaml index 35f02de8..4b540758 100644 --- a/components.yaml +++ b/components.yaml @@ -1,18 +1,15 @@ GEOSldas: fixture: true - develop: develop env: local: ./@env remote: ../ESMA_env.git tag: v4.23.0 - develop: main cmake: local: ./@cmake remote: ../ESMA_cmake.git tag: v3.41.0 - develop: develop ecbuild: local: ./@cmake/@ecbuild @@ -24,37 +21,32 @@ NCEP_Shared: remote: ../NCEP_Shared.git tag: v1.3.0 sparse: ./config/NCEP_Shared.sparse - develop: main GMAO_Shared: local: ./src/Shared/@GMAO_Shared remote: ../GMAO_Shared.git tag: v1.9.7 sparse: ./config/GMAO_Shared.sparse - develop: main GEOS_Util: local: ./src/Shared/@GMAO_Shared/@GEOS_Util remote: ../GEOS_Util.git tag: v2.0.7 sparse: ./config/GEOS_Util.sparse - develop: main MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git tag: v2.44.1 - develop: develop GEOSldas_GridComp: local: ./src/Components/@GEOSldas_GridComp remote: ../GEOSldas_GridComp.git - branch: develop - develop: develop + tag: v1.0.1 GEOSgcm_GridComp: local: ./src/Components/@GEOSldas_GridComp/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - branch: develop + tag: v2.5.2 sparse: ./config/GEOSgcm_GridComp_ldas.sparse - develop: develop + From 99f8617f25445177ee9194a41a32541db2e9d992 Mon Sep 17 00:00:00 2001 From: Rolf Reichle Date: Wed, 10 Apr 2024 17:14:51 -0400 Subject: [PATCH 2/5] change components.yaml back to develop version --- components.yaml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/components.yaml b/components.yaml index 4b540758..35f02de8 100644 --- a/components.yaml +++ b/components.yaml @@ -1,15 +1,18 @@ GEOSldas: fixture: true + develop: develop env: local: ./@env remote: ../ESMA_env.git tag: v4.23.0 + develop: main cmake: local: ./@cmake remote: ../ESMA_cmake.git tag: v3.41.0 + develop: develop ecbuild: local: ./@cmake/@ecbuild @@ -21,32 +24,37 @@ NCEP_Shared: remote: ../NCEP_Shared.git tag: v1.3.0 sparse: ./config/NCEP_Shared.sparse + develop: main GMAO_Shared: local: ./src/Shared/@GMAO_Shared remote: ../GMAO_Shared.git tag: v1.9.7 sparse: ./config/GMAO_Shared.sparse + develop: main GEOS_Util: local: ./src/Shared/@GMAO_Shared/@GEOS_Util remote: ../GEOS_Util.git tag: v2.0.7 sparse: ./config/GEOS_Util.sparse + develop: main MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git tag: v2.44.1 + develop: develop GEOSldas_GridComp: local: ./src/Components/@GEOSldas_GridComp remote: ../GEOSldas_GridComp.git - tag: v1.0.1 + branch: develop + develop: develop GEOSgcm_GridComp: local: ./src/Components/@GEOSldas_GridComp/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - tag: v2.5.2 + branch: develop sparse: ./config/GEOSgcm_GridComp_ldas.sparse - + develop: develop From 208a45cdf8a4ce19841fbfac1ce042701d6ab67c Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 11 Apr 2024 13:20:35 -0400 Subject: [PATCH 3/5] 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 4/5] 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 5/5] 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: