From 0454b87b10ae220792bbfbee14b836907d05eb82 Mon Sep 17 00:00:00 2001 From: Weiyuan Jiang Date: Wed, 10 Apr 2024 09:13:47 -0400 Subject: [PATCH 01/10] remove unnecessary lake_gridcomp --- config/GEOSgcm_GridComp_ldas.sparse | 1 + 1 file changed, 1 insertion(+) diff --git a/config/GEOSgcm_GridComp_ldas.sparse b/config/GEOSgcm_GridComp_ldas.sparse index 4d2c1600..1331ebb9 100644 --- a/config/GEOSgcm_GridComp_ldas.sparse +++ b/config/GEOSgcm_GridComp_ldas.sparse @@ -1,6 +1,7 @@ /GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp /GEOSagcm_GridComp/GEOSphysics_GridComp/CMakeLists.txt !/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSlandice_GridComp +!/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSlake_GridComp !/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp !/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOS_SurfaceGridComp.F90 From 99f8617f25445177ee9194a41a32541db2e9d992 Mon Sep 17 00:00:00 2001 From: Rolf Reichle Date: Wed, 10 Apr 2024 17:14:51 -0400 Subject: [PATCH 02/10] 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 03/10] 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 04/10] 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 05/10] 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: From d986e63b2fd9e5af1c3797df8c5187f20a40da53 Mon Sep 17 00:00:00 2001 From: Rolf Reichle Date: Thu, 11 Apr 2024 19:34:50 -0400 Subject: [PATCH 06/10] updated CHANGELOG.md in prep for release v18.0.3 --- doc/CHANGELOG.md | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md index e6d171af..e2ddf072 100644 --- a/doc/CHANGELOG.md +++ b/doc/CHANGELOG.md @@ -32,15 +32,32 @@ In March 2024, GEOSldas was split into two repositories, the GEOSldas fixture an This README file contains the history of stable GEOSldas Releases in Git, followed by older, CVS LDASsa tags and GEOSldas versions and change logs. -Overview of Git Releases: +Overview of GEOSldas Git Releases: ============================ +[v18.0.3](https://github.com/GEOS-ESM/GEOSldas/releases/tag/v18.0.3) - 2024-04-11 +------------------------------ + +- 0-diff vs. GEOSldas v18.0.2. + +- Uses GEOSldas_GridComp v1.0.2. + +- Bug fix: + - Fixed state increment array referencing in update_type=13 ([GEOSldas_GridComp PR #26](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/26)). + +- Other minor changes: + - Moved external `@GEOSgcm_GridComp` repository to `GEOSldas/src/Components/` for consistency with directory structure of GEOSgcm and GEOSadas ([GEOSldas_GridComp PR #27](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/27), [GEOSldas_GridComp PR #30](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/30)). + - Changed lenkf.j.template to python string ([GEOSldas_GridComp PR #16](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/16)). + +------------------------------ [v18.0.2](https://github.com/GEOS-ESM/GEOSldas/releases/tag/v18.0.2) - 2024-04-10 ------------------------------ - 0-diff vs. GEOSldas v18.0.1. +- Uses GEOSldas_GridComp v1.0.1. + - Bug fix: - In ldas_setup, fixed submission of job for remapping of restarts ([GEOSldas_GridComp PR #17](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/17)). @@ -50,8 +67,13 @@ Overview of Git Releases: ------------------------------ - 0-diff vs. v18.0.0. + +- Uses GEOSldas_GridComp v1.0.0. + - Essentially identical to v18.0.0 except for revised repository structure after split into two repositories: [GEOSldas](https://github.com/GEOS-ESM/GEOSldas) and [GEOSldas_GridComp](https://github.com/GEOS-ESM/GEOSldas_GridComp) ([PR #748](https://github.com/GEOS-ESM/GEOSldas/pull/748), [PR #750](https://github.com/GEOS-ESM/GEOSldas/pull/750)). + + - Minor changes: - Support for running "sbatch [FULL_PATH/]lenkf.j" from any directory ([PR #745](https://github.com/GEOS-ESM/GEOSldas/pull/745)). From 006b8c35d85cf76a51ce40e49699d3632daecc1e Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 12 Apr 2024 08:52:26 -0400 Subject: [PATCH 07/10] Fix CI for LDAS workflow --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index cb24b2ed..8e0a2477 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,4 +21,6 @@ workflows: #baselibs_version: *baselibs_version repo: GEOSldas mepodevelop: false + # This is needed due to the LDAS BRIDGE workflow + checkout_if_exists: false persist_workspace: false # Needs to be true to run fv3/gcm experiment, costs extra From 551b6fe28eab292cc7443e0a7c258bc7083b400b Mon Sep 17 00:00:00 2001 From: Rolf Reichle Date: Fri, 12 Apr 2024 09:06:02 -0400 Subject: [PATCH 08/10] updated CHANGELOG.md in prep for release v18.0.3 --- doc/CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md index e2ddf072..99881013 100644 --- a/doc/CHANGELOG.md +++ b/doc/CHANGELOG.md @@ -36,7 +36,7 @@ Overview of GEOSldas Git Releases: ============================ -[v18.0.3](https://github.com/GEOS-ESM/GEOSldas/releases/tag/v18.0.3) - 2024-04-11 +[v18.0.3](https://github.com/GEOS-ESM/GEOSldas/releases/tag/v18.0.3) - 2024-04-12 ------------------------------ - 0-diff vs. GEOSldas v18.0.2. @@ -46,6 +46,9 @@ Overview of GEOSldas Git Releases: - Bug fix: - Fixed state increment array referencing in update_type=13 ([GEOSldas_GridComp PR #26](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/26)). +- Infrastructure: + - Fixed CI for LDAS workflow ([PR #768](https://github.com/GEOS-ESM/GEOSldas/pull/768), [GEOSldas_GridComp PR #34](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/34)). + - Other minor changes: - Moved external `@GEOSgcm_GridComp` repository to `GEOSldas/src/Components/` for consistency with directory structure of GEOSgcm and GEOSadas ([GEOSldas_GridComp PR #27](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/27), [GEOSldas_GridComp PR #30](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/30)). - Changed lenkf.j.template to python string ([GEOSldas_GridComp PR #16](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/16)). From 25f5c206f3ff5aaa48e90165700d7d29ca0d5ada Mon Sep 17 00:00:00 2001 From: Rolf Reichle Date: Fri, 12 Apr 2024 10:21:27 -0400 Subject: [PATCH 09/10] updated components.yaml in prep for release v18.0.3 --- components.yaml | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/components.yaml b/components.yaml index a0c07b76..b6ec291c 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.2 GEOSgcm_GridComp: - local: ./src/Components/@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 62e990428a2de826c9cd9d5a303cad97760f296d Mon Sep 17 00:00:00 2001 From: Rolf Reichle Date: Fri, 12 Apr 2024 10:42:35 -0400 Subject: [PATCH 10/10] fixed components.yaml in prep for release v18.0.3 --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index b6ec291c..9ea3b971 100644 --- a/components.yaml +++ b/components.yaml @@ -45,7 +45,7 @@ GEOSldas_GridComp: tag: v1.0.2 GEOSgcm_GridComp: - local: ./src/Components/@GEOSldas_GridComp/@GEOSgcm_GridComp + local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git tag: v2.5.2 sparse: ./config/GEOSgcm_GridComp_ldas.sparse