From 26d00f55e9337e99fd6cee94c3cd68811219beec Mon Sep 17 00:00:00 2001 From: Rolf Reichle Date: Tue, 16 May 2023 17:47:33 -0400 Subject: [PATCH 1/3] added CATCHMENT_SPINUP resource variable --- components.yaml | 2 +- src/Applications/LDAS_App/GEOSldas_LDAS.rc | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/components.yaml b/components.yaml index 72c66f77..c770c767 100644 --- a/components.yaml +++ b/components.yaml @@ -41,6 +41,6 @@ MAPL: GEOSgcm_GridComp: local: ./src/Components/GEOSldas_GridComp/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - branch: develop + branch: feature/rreichle/catch_spinup_mode sparse: ./config/GEOSgcm_GridComp_ldas.sparse develop: develop diff --git a/src/Applications/LDAS_App/GEOSldas_LDAS.rc b/src/Applications/LDAS_App/GEOSldas_LDAS.rc index 8e35303b..9b462ae1 100644 --- a/src/Applications/LDAS_App/GEOSldas_LDAS.rc +++ b/src/Applications/LDAS_App/GEOSldas_LDAS.rc @@ -25,9 +25,16 @@ CATCHMENT_OFFLINE: 1 # 1 : Catchment model (default) # 2 : CatchmentCN-CLM4.0 # 3 : CatchmentCN-CLM4.5 - +# LSM_CHOICE: 1 +# ---- Catchment/CatchmentCN spinup mode +# +# 0 : None (default) +# 1 : Remove snow every Aug 1 (Northern Hemisphere) or Feb 1 (Southern Hemisphere) +# +CATCHMENT_SPINUP: 0 + # ---- Domain definition # From 4fd7d22c7efafa357e1f590b90fc2d522f99e4b2 Mon Sep 17 00:00:00 2001 From: Rolf Reichle <54944691+gmao-rreichle@users.noreply.github.com> Date: Fri, 23 Jun 2023 08:48:02 -0400 Subject: [PATCH 2/3] Moved and edited block for CATCHMENT_SPINUP (GEOSldas_LDAS.rc) --- src/Applications/LDAS_App/GEOSldas_LDAS.rc | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/Applications/LDAS_App/GEOSldas_LDAS.rc b/src/Applications/LDAS_App/GEOSldas_LDAS.rc index 9b462ae1..3c290a17 100644 --- a/src/Applications/LDAS_App/GEOSldas_LDAS.rc +++ b/src/Applications/LDAS_App/GEOSldas_LDAS.rc @@ -11,7 +11,7 @@ #################################################################################### -# ---- Using Catchment/CatchmentCN offline? +# ---- Using Catchment[CN] offline? # # 0: DEFAULT for GCM, (WW,CH,CM,CQ,FR) are required in Catchment restart file # 1: DEFAULT for GEOSldas, (WW,CH,CM,CQ,FR) are optional @@ -20,6 +20,15 @@ # CATCHMENT_OFFLINE: 1 + +# ---- Catchment[CN] spinup mode +# +# 0 : No spinup (default) +# 1 : remove snow every Aug 1 in N. Hemisphere and every Feb 1 in S. Hemisphere +# +CATCHMENT_SPINUP: 0 + + # ---- Choice of land surface model # # 1 : Catchment model (default) @@ -28,13 +37,6 @@ CATCHMENT_OFFLINE: 1 # LSM_CHOICE: 1 -# ---- Catchment/CatchmentCN spinup mode -# -# 0 : None (default) -# 1 : Remove snow every Aug 1 (Northern Hemisphere) or Feb 1 (Southern Hemisphere) -# -CATCHMENT_SPINUP: 0 - # ---- Domain definition # From 1974d0cec1134e626f4c4560042b71457e2cbbd1 Mon Sep 17 00:00:00 2001 From: Biljana Orescanin <68251545+biljanaorescanin@users.noreply.github.com> Date: Wed, 12 Jul 2023 15:25:58 -0400 Subject: [PATCH 3/3] Update components.yaml Revert components yaml prior to merge --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index 845ccce4..5ca4fecb 100644 --- a/components.yaml +++ b/components.yaml @@ -41,6 +41,6 @@ MAPL: GEOSgcm_GridComp: local: ./src/Components/GEOSldas_GridComp/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - branch: feature/rreichle/catch_spinup_mode + branch: develop sparse: ./config/GEOSgcm_GridComp_ldas.sparse develop: develop