From 17ca334ae7781abf215817d787bbc07781613a60 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Wed, 15 Jan 2025 13:37:02 -0800 Subject: [PATCH 1/4] change secondary forest history names per ngeet/fates#1273 --- .../testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm index 92434df000..099f1dfab8 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm @@ -8,7 +8,7 @@ use_fates_tree_damage = .true. hist_ndens = 1 hist_fincl1 = 'FATES_TLONGTERM', 'FATES_TGROWTH','FATES_SEEDS_IN_GRIDCELL_PF','FATES_SEEDS_OUT_GRIDCELL_PF','FATES_NCL_AP', -'FATES_NPATCH_AP','FATES_VEGC_AP','FATES_SECONDAREA_ANTHRODIST_AP','FATES_SECONDAREA_DIST_AP', +'FATES_NPATCH_AP','FATES_VEGC_AP','FATES_SECONDAREA_ANTHRODISTAGE_AP','FATES_SECONDARY_AREA_AP', 'FATES_FUEL_AMOUNT_APFC','FATES_STOREC_TF_USTORY_SZPF','FATES_STOREC_TF_CANOPY_SZPF', 'FATES_CROWNAREA_CLLL','FATES_ABOVEGROUND_MORT_SZPF', 'FATES_ABOVEGROUND_PROD_SZPF','FATES_NPLANT_SZAP','FATES_NPLANT_CANOPY_SZAP', From 51d5bf5e27418081cbc3a5fea5a62c5d8a7be472 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Thu, 30 Jan 2025 17:15:25 -0800 Subject: [PATCH 2/4] fix fates secondary history output name in allvars --- .../testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm index 099f1dfab8..180c339207 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm @@ -8,7 +8,7 @@ use_fates_tree_damage = .true. hist_ndens = 1 hist_fincl1 = 'FATES_TLONGTERM', 'FATES_TGROWTH','FATES_SEEDS_IN_GRIDCELL_PF','FATES_SEEDS_OUT_GRIDCELL_PF','FATES_NCL_AP', -'FATES_NPATCH_AP','FATES_VEGC_AP','FATES_SECONDAREA_ANTHRODISTAGE_AP','FATES_SECONDARY_AREA_AP', +'FATES_NPATCH_AP','FATES_VEGC_AP','FATES_SECONDARY_ANTHRODISTAGE_AP','FATES_SECONDARY_AREA_AP', 'FATES_FUEL_AMOUNT_APFC','FATES_STOREC_TF_USTORY_SZPF','FATES_STOREC_TF_CANOPY_SZPF', 'FATES_CROWNAREA_CLLL','FATES_ABOVEGROUND_MORT_SZPF', 'FATES_ABOVEGROUND_PROD_SZPF','FATES_NPLANT_SZAP','FATES_NPLANT_CANOPY_SZAP', From 1137ffa90c434ff5413f97d20dc50a4764a977fd Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Thu, 30 Jan 2025 22:33:52 -0800 Subject: [PATCH 3/4] add missing variables that should be in allvars --- .../testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm index 180c339207..18b6cc66c8 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm @@ -56,4 +56,5 @@ hist_fincl1 = 'FATES_TLONGTERM', 'FATES_PARSUN_CL','FATES_PARSHA_CL','FATES_LAISUN_CLLL','FATES_LAISHA_CLLL','FATES_LAISUN_CLLLPF', 'FATES_LAISHA_CLLLPF','FATES_PARPROF_DIR_CLLLPF','FATES_PARPROF_DIF_CLLLPF','FATES_LAISUN_CL','FATES_LAISHA_CL', 'FATES_PARPROF_DIR_CLLL','FATES_PARPROF_DIF_CLLL','FATES_NET_C_UPTAKE_CLLL','FATES_CROWNFRAC_CLLLPF', -'FATES_LBLAYER_COND_AP','FATES_STOMATAL_COND_AP' +'FATES_LBLAYER_COND_AP','FATES_STOMATAL_COND_AP','FATES_TLONGTERM','FATES_PRIMARY_AREA_AP','FATES_NPP_LU', +'FATES_L2FR_CLSZPF','FATES_GPP_LU','FATES_C13DISC_SZPF' From b1668f4a3ef89527759368eafd2a05d0133f9da6 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Thu, 30 Jan 2025 23:44:32 -0800 Subject: [PATCH 4/4] remove fates_l2fr_clszpf for fatescoldallvars --- .../testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm index 18b6cc66c8..286c27ea56 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm @@ -57,4 +57,4 @@ hist_fincl1 = 'FATES_TLONGTERM', 'FATES_LAISHA_CLLLPF','FATES_PARPROF_DIR_CLLLPF','FATES_PARPROF_DIF_CLLLPF','FATES_LAISUN_CL','FATES_LAISHA_CL', 'FATES_PARPROF_DIR_CLLL','FATES_PARPROF_DIF_CLLL','FATES_NET_C_UPTAKE_CLLL','FATES_CROWNFRAC_CLLLPF', 'FATES_LBLAYER_COND_AP','FATES_STOMATAL_COND_AP','FATES_TLONGTERM','FATES_PRIMARY_AREA_AP','FATES_NPP_LU', -'FATES_L2FR_CLSZPF','FATES_GPP_LU','FATES_C13DISC_SZPF' +'FATES_GPP_LU','FATES_C13DISC_SZPF'