From ecdbc36f5c979a742dc8402413bd2a971640a74d Mon Sep 17 00:00:00 2001 From: gmao-jkolassa Date: Wed, 19 Oct 2022 14:30:31 -0400 Subject: [PATCH 01/14] pointing to GEOSgcm_GridComp branch for CNCLM51 --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index 4b87d45d..871a61e1 100644 --- a/components.yaml +++ b/components.yaml @@ -35,6 +35,6 @@ MAPL: GEOSgcm_GridComp: local: ./src/Components/GEOSldas_GridComp/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - branch: develop + branch: feature/jkolassa_cnclm51 sparse: ./config/GEOSgcm_GridComp_ldas.sparse develop: develop From 47a2daf5107828ea24626af56d41988cbcd5f42b Mon Sep 17 00:00:00 2001 From: gmao-jkolassa Date: Mon, 7 Nov 2022 12:35:30 -0500 Subject: [PATCH 02/14] update MAPL --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index 871a61e1..f552189e 100644 --- a/components.yaml +++ b/components.yaml @@ -29,7 +29,7 @@ GMAO_Shared: MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - tag: v2.27.1 + tag: v2.29.0 develop: develop GEOSgcm_GridComp: From 955373af6e757eb73002eadd5bc21d84af4c4752 Mon Sep 17 00:00:00 2001 From: gmao-jkolassa Date: Tue, 24 Jan 2023 14:03:05 -0500 Subject: [PATCH 03/14] update ldas_setup for LSM_CHOICE 4 --- src/Applications/LDAS_App/ldas_setup | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Applications/LDAS_App/ldas_setup b/src/Applications/LDAS_App/ldas_setup index a904b03f..70498852 100755 --- a/src/Applications/LDAS_App/ldas_setup +++ b/src/Applications/LDAS_App/ldas_setup @@ -335,6 +335,8 @@ class LDASsetup: self.catch = 'catchcnclm40' if int(self.rqdExeInp['LSM_CHOICE']) == 3 : self.catch = 'catchcnclm45' + if int(self.rqdExeInp['LSM_CHOICE']) == 4 : + self.catch = 'catchcnclm51' if 'POSTPROC_HIST' not in self.rqdExeInp: self.rqdExeInp['POSTPROC_HIST'] = 0 From 654f01b4b2c80605ce94b09eb96ce7c51d10f0b3 Mon Sep 17 00:00:00 2001 From: gmao-jkolassa Date: Wed, 25 Jan 2023 13:57:30 -0500 Subject: [PATCH 04/14] accommodate LSM_CHOICE = 4 --- src/Applications/LDAS_App/process_hist.csh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/Applications/LDAS_App/process_hist.csh b/src/Applications/LDAS_App/process_hist.csh index 73d3b421..5aad6506 100755 --- a/src/Applications/LDAS_App/process_hist.csh +++ b/src/Applications/LDAS_App/process_hist.csh @@ -51,6 +51,13 @@ if($LSM_CHOICE == 3) then sed -i 's/>>>HIST_CATCHCNCLM45<<>>HIST_CATCHCN<<>>HIST_CATCHCNCLM51<< 1) then set GridComp = ENSAVG sed -i 's|VEGDYN|'VEGDYN_e0000'|g' $HISTRC From c8d53b87e4b4709ca40fe7ad3b41d9baac83d703 Mon Sep 17 00:00:00 2001 From: gmao-jkolassa Date: Wed, 25 Jan 2023 15:50:05 -0500 Subject: [PATCH 05/14] group LSM_CHOICE 3 and 4 --- src/Applications/LDAS_App/process_hist.csh | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/Applications/LDAS_App/process_hist.csh b/src/Applications/LDAS_App/process_hist.csh index 5aad6506..58bedb84 100755 --- a/src/Applications/LDAS_App/process_hist.csh +++ b/src/Applications/LDAS_App/process_hist.csh @@ -45,18 +45,12 @@ if($LSM_CHOICE == 2) then sed -i 's/>>>HIST_CATCHCN<<= 3) then set GridComp = CATCHCN sed -i 's/>>>HIST_CATCHCN<<>>HIST_CATCHCNCLM45<<>>HIST_CATCHCN<<>>HIST_CATCHCNCLM51<< 1) then set GridComp = ENSAVG From dc738a671803979ebe2a36d233417c40a6b5e8bc Mon Sep 17 00:00:00 2001 From: gmao-jkolassa Date: Fri, 24 Feb 2023 09:43:20 -0500 Subject: [PATCH 06/14] point to MAPL with updated get_var --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index b4978dea..3bbb2f6f 100644 --- a/components.yaml +++ b/components.yaml @@ -35,7 +35,7 @@ GEOS_Util: MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - tag: v2.34.1 + branch: feature/wjiang/add_reading_writing_chars develop: develop GEOSgcm_GridComp: From ac3ba4b20bdad643f7238f087473e2cfcca8b092 Mon Sep 17 00:00:00 2001 From: gmao-jkolassa Date: Tue, 28 Feb 2023 12:31:33 -0500 Subject: [PATCH 07/14] point to MAPL develop branch --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index 3bbb2f6f..f12f4274 100644 --- a/components.yaml +++ b/components.yaml @@ -35,7 +35,7 @@ GEOS_Util: MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - branch: feature/wjiang/add_reading_writing_chars + branch: develop develop: develop GEOSgcm_GridComp: From 11f756dbbb54e5507dd43345ccb09f59cc933fbd Mon Sep 17 00:00:00 2001 From: gmao-jkolassa Date: Wed, 15 May 2024 09:21:53 -0400 Subject: [PATCH 08/14] point to new GEOSldas_GridComp branch --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index abaa24e3..36fb9321 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/jkolassa_cnclm51 develop: develop GEOSgcm_GridComp: From eb5684ba36c2db23c0b5cd14a57abe38357aa9a3 Mon Sep 17 00:00:00 2001 From: gmao-jkolassa Date: Fri, 27 Jun 2025 11:49:55 -0400 Subject: [PATCH 09/14] using MAPL develop branch until it is published in a tag --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index 3b86525f..9eea2b09 100644 --- a/components.yaml +++ b/components.yaml @@ -51,7 +51,7 @@ GMAO_perllib: MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - tag: v2.56.0 + branch: develop develop: develop GEOSldas_GridComp: From 4f4023b04ab50049119b180a0efe2687e7b19bdd Mon Sep 17 00:00:00 2001 From: gmao-jkolassa Date: Tue, 1 Jul 2025 12:43:40 -0400 Subject: [PATCH 10/14] use MAPL tag v2.57.0 --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index d1c49a25..4be01f61 100644 --- a/components.yaml +++ b/components.yaml @@ -51,7 +51,7 @@ GMAO_perllib: MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - branch: develop + tag: v2.57.0 develop: develop GEOSldas_GridComp: From 65e995f3544f7c0f6a4dbaa39904b510df778d01 Mon Sep 17 00:00:00 2001 From: Rolf Reichle <54944691+gmao-rreichle@users.noreply.github.com> Date: Wed, 6 Aug 2025 12:26:57 -0400 Subject: [PATCH 11/14] Temporarily specify GEOS_Util branch in components.yaml --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index 4be01f61..9d9e914f 100644 --- a/components.yaml +++ b/components.yaml @@ -36,7 +36,7 @@ GMAO_Shared: GEOS_Util: local: ./src/Shared/@GMAO_Shared/@GEOS_Util remote: ../GEOS_Util.git - tag: v2.1.9 + branc: feature/wjiang/cnclm51 sparse: ./config/GEOS_Util.sparse develop: main From 749560faecb398ad3e466b6aa7238b6f84a9670a Mon Sep 17 00:00:00 2001 From: Rolf Reichle <54944691+gmao-rreichle@users.noreply.github.com> Date: Wed, 6 Aug 2025 15:36:31 -0400 Subject: [PATCH 12/14] Update components.yaml Fix typo in previous commit --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index 9d9e914f..8bc9f7ec 100644 --- a/components.yaml +++ b/components.yaml @@ -36,7 +36,7 @@ GMAO_Shared: GEOS_Util: local: ./src/Shared/@GMAO_Shared/@GEOS_Util remote: ../GEOS_Util.git - branc: feature/wjiang/cnclm51 + branch: feature/wjiang/cnclm51 sparse: ./config/GEOS_Util.sparse develop: main From 84ed13cde43c3d866308d2a66bf8dac7720e7619 Mon Sep 17 00:00:00 2001 From: Rolf Reichle <54944691+gmao-rreichle@users.noreply.github.com> Date: Thu, 28 Aug 2025 15:58:53 -0400 Subject: [PATCH 13/14] switching GEOS_Util branch to "main" while awaiting new release (components.yaml) --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index 8bc9f7ec..071bdd6e 100644 --- a/components.yaml +++ b/components.yaml @@ -36,7 +36,7 @@ GMAO_Shared: GEOS_Util: local: ./src/Shared/@GMAO_Shared/@GEOS_Util remote: ../GEOS_Util.git - branch: feature/wjiang/cnclm51 + branch: main sparse: ./config/GEOS_Util.sparse develop: main From 558970d4a35803471f0a801a443f4772ec926af8 Mon Sep 17 00:00:00 2001 From: Rolf Reichle <54944691+gmao-rreichle@users.noreply.github.com> Date: Fri, 29 Aug 2025 15:30:06 -0400 Subject: [PATCH 14/14] Update to GEOS_Util v2.1.10 (components.yaml) --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index 071bdd6e..76be2b09 100644 --- a/components.yaml +++ b/components.yaml @@ -36,7 +36,7 @@ GMAO_Shared: GEOS_Util: local: ./src/Shared/@GMAO_Shared/@GEOS_Util remote: ../GEOS_Util.git - branch: main + tag: v2.1.10 sparse: ./config/GEOS_Util.sparse develop: main