From 6d68f9928cc20847dbfb9741c14d336fe9c63667 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 11 Apr 2024 13:20:45 -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: --- CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b4c0974..ffb1ef4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,5 @@ esma_set_this () -esma_add_subdirectory(GEOSgcm_GridComp) - set (alldirs GEOSmetforce_GridComp GEOSlandpert_GridComp From 57f674b65b79c2e6b95a82ba69dfbcae270eb6a3 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 11 Apr 2024 13:27:03 -0400 Subject: [PATCH 2/3] Update changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c43a31..91ccc9f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Changed + +- Moved the location mepo clones `GEOSgcm_GridComp` to under `GEOSldas/src/Components` parallel + to `GEOSldas_GridComp` rather than inside `GEOSldas_GridComp` itself. This is to be + consistent with the structure of the GEOSgcm and GEOSldas components. + ----------------------------- ## [v1.0.1] - 2024-04-10 From 47d4a39b3afdcd57484df91878fe035924deea6e Mon Sep 17 00:00:00 2001 From: Rolf Reichle <54944691+gmao-rreichle@users.noreply.github.com> Date: Thu, 11 Apr 2024 14:17:35 -0400 Subject: [PATCH 3/3] Update CHANGELOG.md --- CHANGELOG.md | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 88a9f9c..3a91b7b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,24 +9,27 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -### Changed - -- Moved the location mepo clones `GEOSgcm_GridComp` to under `GEOSldas/src/Components` parallel - to `GEOSldas_GridComp` rather than inside `GEOSldas_GridComp` itself. This is to be - consistent with the structure of the GEOSgcm and GEOSldas components. - ----------------------------- ## [v1.0.2] - 2024-04-11 +- 0-diff vs. v1.0.1. + ### Fixed -- Bugfix for state increment array referencing in update_type=13 +- Bugfix for state increment array referencing in update_type=13. +### Changed + +- Moved external `GEOSgcm_GridComp` repository to under `GEOSldas/src/Components` for + consistency with directory structure of GEOSgcm and GEOSadas. + ----------------------------- ## [v1.0.1] - 2024-04-10 +- 0-diff vs. v1.0.0. + ### Fixed - ldas_setup: Changed entry 'slurm' to 'slurm_pbs' to match remap_params.tpl