From 338be7b6262f0e2a8396dabe601892a1a9d8e8f5 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Thu, 26 Mar 2020 13:56:25 -0600 Subject: [PATCH] Turn off the 2D variables in the Fates tests so that they work --- .../testmods_dirs/clm/Fates/user_nl_clm | 18 ++++++++++++------ .../testmods_dirs/clm/FatesColdDef/user_nl_clm | 16 +++++++++++----- .../clm/FatesShortList/user_nl_clm | 11 ++++++++--- .../include_user_mods | 2 -- 4 files changed, 31 insertions(+), 16 deletions(-) delete mode 100644 cime_config/testdefs/testmods_dirs/clm/ignor_warn_cropMonthOutput/include_user_mods diff --git a/cime_config/testdefs/testmods_dirs/clm/Fates/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/Fates/user_nl_clm index e7f1e272d1..9a1fb1e6e3 100644 --- a/cime_config/testdefs/testmods_dirs/clm/Fates/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/Fates/user_nl_clm @@ -3,11 +3,17 @@ hist_mfilt = 365 hist_nhtfrq = -24 hist_empty_htapes = .true. use_fates_spitfire= .true. -hist_fincl1 = 'NPP','GPP','BTRAN','H2OSOI','TLAI','LITTER_IN_ELEM','LITTER_OUT_ELEM', +!hist_fincl1 = 'NPP','GPP','BTRAN','H2OSOI','TLAI','LITTER_IN_ELEM','LITTER_OUT_ELEM', +! 'FIRE_AREA','SCORCH_HEIGHT','FIRE_INTENSITY','FIRE_TFC_ROS','fire_fuel_mef', +! 'fire_fuel_bulkd','fire_fuel_sav','FIRE_NESTEROV_INDEX','PFTbiomass', +! 'PFTleafbiomass','FIRE_ROS','WIND','AREA_TREES','AREA_PLANT', +! 'TOTSOMC','TOTLITC','T_SCALAR','NEP','HR','NPLANT_SCAG','NPLANT_SCPF', +! 'BA_SCLS','NPP_BY_AGE','CWD_AG_CWDSC','PARSUN_Z_CNLF','PARSUN_Z_CNLFPFT','PARSHA_Z_CAN', +! 'LITTER_FINES_AG_ELEM','LITTER_FINES_BG_ELEM','LITTER_CWD_AG_ELEM','LITTER_CWD_BG_ELEM', +! 'SEED_BANK' +hist_fincl1 = 'NPP','GPP','BTRAN','H2OSOI','TLAI', 'FIRE_AREA','SCORCH_HEIGHT','FIRE_INTENSITY','FIRE_TFC_ROS','fire_fuel_mef', - 'fire_fuel_bulkd','fire_fuel_sav','FIRE_NESTEROV_INDEX','PFTbiomass', - 'PFTleafbiomass','FIRE_ROS','WIND','AREA_TREES','AREA_PLANT', - 'TOTSOMC','TOTLITC','T_SCALAR','NEP','HR','NPLANT_SCAG','NPLANT_SCPF', - 'BA_SCLS','NPP_BY_AGE','CWD_AG_CWDSC','PARSUN_Z_CNLF','PARSUN_Z_CNLFPFT','PARSHA_Z_CAN', - 'LITTER_FINES_AG_ELEM','LITTER_FINES_BG_ELEM','LITTER_CWD_AG_ELEM','LITTER_CWD_BG_ELEM', + 'fire_fuel_bulkd','fire_fuel_sav','FIRE_NESTEROV_INDEX' + 'FIRE_ROS','WIND','AREA_TREES','AREA_PLANT', + 'TOTSOMC','TOTLITC','T_SCALAR','NEP','HR' 'SEED_BANK' diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDef/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdDef/user_nl_clm index 25c9d2a116..47173dcae3 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdDef/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdDef/user_nl_clm @@ -1,6 +1,12 @@ -hist_fincl1 = 'NPP','GPP','BTRAN','H2OSOI','TLAI','LITTER_IN','LITTER_OUT', +!hist_fincl1 = 'NPP','GPP','BTRAN','H2OSOI','TLAI','LITTER_IN','LITTER_OUT', +! 'FIRE_AREA','SCORCH_HEIGHT','FIRE_INTENSITY','FIRE_TFC_ROS','fire_fuel_mef', +! 'fire_fuel_bulkd','fire_fuel_sav','FIRE_NESTEROV_INDEX','PFTbiomass', +! 'PFTleafbiomass','FIRE_ROS','WIND','AREA_TREES','AREA_PLANT', +! 'TOTSOMC','TOTLITC','T_SCALAR','NEP','HR','NPLANT_SCAG','NPLANT_SCPF', +! 'BA_SCLS','NPP_BY_AGE','CWD_AG_CWDSC','PARSUN_Z_CNLF','PARSUN_Z_CNLFPFT','PARSHA_Z_CAN' +hist_fincl1 = 'NPP','GPP','BTRAN','H2OSOI','TLAI', 'FIRE_AREA','SCORCH_HEIGHT','FIRE_INTENSITY','FIRE_TFC_ROS','fire_fuel_mef', - 'fire_fuel_bulkd','fire_fuel_sav','FIRE_NESTEROV_INDEX','PFTbiomass', - 'PFTleafbiomass','FIRE_ROS','WIND','AREA_TREES','AREA_PLANT', - 'TOTSOMC','TOTLITC','T_SCALAR','NEP','HR','NPLANT_SCAG','NPLANT_SCPF', - 'BA_SCLS','NPP_BY_AGE','CWD_AG_CWDSC','PARSUN_Z_CNLF','PARSUN_Z_CNLFPFT','PARSHA_Z_CAN' + 'fire_fuel_bulkd','fire_fuel_sav','FIRE_NESTEROV_INDEX' + 'FIRE_ROS','WIND','AREA_TREES','AREA_PLANT', + 'TOTSOMC','TOTLITC','T_SCALAR','NEP','HR' + 'SEED_BANK' diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesShortList/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesShortList/user_nl_clm index fc057c0be3..446698db2c 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesShortList/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/FatesShortList/user_nl_clm @@ -1,5 +1,10 @@ -hist_fincl1 = 'NPP','GPP','BTRAN','H2OSOI','TLAI','LITTER_IN','LITTER_OUT', +!hist_fincl1 = 'NPP','GPP','BTRAN','H2OSOI','TLAI','LITTER_IN','LITTER_OUT', +! 'FIRE_AREA','SCORCH_HEIGHT','FIRE_INTENSITY','FIRE_TFC_ROS','fire_fuel_mef', +! 'fire_fuel_bulkd','fire_fuel_sav','FIRE_NESTEROV_INDEX','PFTbiomass', +! 'PFTleafbiomass','FIRE_ROS','WIND','AREA_TREES','AREA_PLANT', +! 'TOTSOMC','TOTLITC','T_SCALAR','NEP','HR' +hist_fincl1 = 'NPP','GPP','BTRAN','H2OSOI','TLAI', 'FIRE_AREA','SCORCH_HEIGHT','FIRE_INTENSITY','FIRE_TFC_ROS','fire_fuel_mef', - 'fire_fuel_bulkd','fire_fuel_sav','FIRE_NESTEROV_INDEX','PFTbiomass', - 'PFTleafbiomass','FIRE_ROS','WIND','AREA_TREES','AREA_PLANT', + 'fire_fuel_bulkd','fire_fuel_sav','FIRE_NESTEROV_INDEX' + 'FIRE_ROS','WIND','AREA_TREES','AREA_PLANT', 'TOTSOMC','TOTLITC','T_SCALAR','NEP','HR' diff --git a/cime_config/testdefs/testmods_dirs/clm/ignor_warn_cropMonthOutput/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/ignor_warn_cropMonthOutput/include_user_mods deleted file mode 100644 index 6aed6a8eea..0000000000 --- a/cime_config/testdefs/testmods_dirs/clm/ignor_warn_cropMonthOutput/include_user_mods +++ /dev/null @@ -1,2 +0,0 @@ -../_includes/ignore_warnings -../cropMonthOutput