Revert "Turn off the 2D variables in the Fates tests so that they work"

This reverts commit 338be7b.
ekluzek · Apr 8, 2020 · 3227bc1 · 3227bc1
1 parent aa34b3a
commit 3227bc1
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 31 deletions.
diff --git a/cime_config/testdefs/testmods_dirs/clm/Fates/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/Fates/user_nl_clm
@@ -3,17 +3,11 @@ 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',
-!   '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',
+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'
-   'FIRE_ROS','WIND','AREA_TREES','AREA_PLANT',
-   'TOTSOMC','TOTLITC','T_SCALAR','NEP','HR'
+   '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'
diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDef/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdDef/user_nl_clm
@@ -1,12 +1,6 @@
-!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',
+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'
-   'FIRE_ROS','WIND','AREA_TREES','AREA_PLANT',
-   'TOTSOMC','TOTLITC','T_SCALAR','NEP','HR'
-   'SEED_BANK'
+   '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'
diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesShortList/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesShortList/user_nl_clm
@@ -1,10 +1,5 @@
-!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',
+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'
-   'FIRE_ROS','WIND','AREA_TREES','AREA_PLANT',
+   'fire_fuel_bulkd','fire_fuel_sav','FIRE_NESTEROV_INDEX','PFTbiomass',
+   'PFTleafbiomass','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
@@ -0,0 +1,2 @@
+../_includes/ignore_warnings
+../cropMonthOutput