Merge tag 'ctsm5.3.034_noresm_v5' into feature/additional_liquid_tracers

Fix for reduced output for coupled runs

Author: mvertens

cime_config/testdefs/testlist_clm.xml

@@ -4389,6 +4389,15 @@
       <option name="comment">""</option>
     </options>
   </test>
+  <test name="SMS_Ld1" grid="f45_f45_mg37" compset="I1850Clm60FatesSp" testmods="clm/FatesColdReducedOutput">
+    <machines>
+      <machine name="betzy" compiler="gnu" category="aux_clm_noresm"/>
+    </machines>
+    <options>
+      <option name="wallclock">00:30:00</option>
+      <option name="comment">Simple test to make sure the basic Fates-SP compset works</option>
+    </options>
+  </test>
 
   <!-- FATES-NOCOMP -->
 
@@ -4437,6 +4446,16 @@
       <option name="comment">Ensure functionality of two-stream radiation option with nocomp-fixedbiogeo in FATES</option>
     </options>
   </test>
+  <test name="SMS_Ld1" grid="f45_f45_mg37" compset="I1850Clm60FatesNoComp" testmods="clm/FatesColdReducedOutput">
+    <machines>
+      <machine name="betzy" compiler="gnu" category="aux_clm_noresm"/>
+    </machines>
+    <options>
+      <option name="wallclock">00:30:00</option>
+      <option name="comment">Simple test to make sure the basic Fates-SP compset works</option>
+    </options>
+  </test>
+
 
   <!-- FATES-FULL -->
 

cime_config/testdefs/testmods_dirs/clm/FatesColdReducedOutput/include_user_mods

@@ -0,0 +1,2 @@
+../../../../usermods_dirs/clm/reduced_output_fates
+../FatesColdBasic

cime_config/testdefs/testmods_dirs/clm/FatesColdSpinup/shell_commands

@@ -1,5 +1,5 @@
 ./xmlchange DATM_CPLHIST_CASE=n1850fates-nocomp-cplhist
-./xmlchange DATM_CPLHIST_DIR=' /cluster/projects/nn1004k/mdeb/cplhist/n1850fates-nocomp-cplhist/cpl/hist'
+./xmlchange DATM_CPLHIST_DIR='/cluster/shared/noresm/inputdata/cplhist/noresm3_0/n1850fates-nocomp-cplhist/cpl/hist'
 ./xmlchange DATM_YR_START=1
 ./xmlchange DATM_YR_END=1
 ./xmlchange DATM_YR_ALIGN=1

cime_config/usermods_dirs/clm/reduced_output_fates/shell_commands

@@ -0,0 +1,9 @@
+
+compset=`./xmlquery COMPSET --value` 
+echo "fates_history_dimlevel = 1,1" >> user_nl_clm 
+if [[ $compset =~ .*CLM[0-9]+%[^_]*FATES-SP.* ]]; then 
+    echo "hist_fexcl1= 'FATES_CBALANCE_ERROR','FATES_COLD_STATUS','FATES_BURNFRAC','FATES_CROOTMAINTAR','FATES_CROOT_ALLOC','FATES_DAYSINCE_COLDLEAFOFF','FATES_DAYSINCE_COLDLEAFON','FATES_DEMOTION_CARBONFLUX','FATES_DISTURBANCE_RATE_FIRE','FATES_DISTURBANCE_RATE_LOGGING','FATES_DISTURBANCE_RATE_TREEFALL','FATES_EFFECT_WSPEED','FATES_EXCESS_RESP','FATES_FDI','FATES_FIRE_CLOSS','FATES_FIRE_INTENSITY','FATES_FIRE_INTENSITY_BURNFRAC','FATES_FROOT_ALLOC','FATES_FUELCONSUMED','FATES_FUEL_AMOUNT','FATES_FUEL_BULKD','FATES_FUEL_EFF_MOIST','FATES_GDD','FATES_FUEL_SAV','FATES_HARVEST_DEBT','FATES_HARVEST_DEBT_SEC','FATES_HARVEST_WOODPROD_C_FLUX','FATES_HET_RESP','FATES_IGNITIONS','FATES_LEAF_ALLOC','FATES_LITTER_IN','FATES_LITTER_OUT','FATES_LSTEMMAINTAR','FATES_LUCHANGE_WOODPROD_C_FLUX','FATES_MAINT_RESP_UNREDUCED','FATES_MORTALITY_CFLUX_CANOPY','FATES_MORTALITY_CFLUX_USTORY','FATES_NCHILLDAYS','FATES_NCOLDDAYS','FATES_NEP','FATES_NESTEROV_INDEX','FATES_NONSTRUCTC','FATES_NPP','FATES_PRIMARY_PATCHFUSION_ERR','FATES_PRIMARY_PATCHFUSION_ERR','FATES_PROMOTION_CARBONFLUX','FATES_REPROC','FATES_ROS','FATES_SAPWOODC','FATES_STEM_ALLOC','FATES_STOREC','FATES_STOREC_TF','FATES_STORE_ALLOC','FATES_STRUCTC','FATES_TRIMMING','FATES_UNGERM_SEED_BANK','FATES_USTORY_VEGC','FATES_VEGC_ABOVEGROUND','FATES_WOOD_PRODUCT','FATES_SEEDLING_POOL','FATES_SEEDS_IN','FATES_SEEDS_IN_LOCAL','FATES_SEED_ALLOC','FATES_SEED_BANK','FSH_R','HEAT_FROM_AC','HIA_R','HIA_U','HUMIDEX_R','HUMIDEX_U','MORTALITY_CROWNAREA_CANOPY','MORTALITY_CROWNAREA_UNDERSTORY','QIRRIG_FROM_GW_CONFINED','QIRRIG_FROM_GW_UNCONFINED','QIRRIG_FROM_SURFACE','SWBGT_R','SWBGT_U',,'WASTEHEAT','WBT','FATES_FUEL_MEF','FATES_GPP_USTORY','HUMIDEX','LNC','TBUILD','URBAN_AC','URBAN_HEAT','VENTILATION','WBT_R','WBT_U'" >> user_nl_clm 
+else 
+    echo "hist_fexcl1='ACTUAL_IMMOB','BTRANMN','EFLXBUILD','EFLX_DYNBAL','EFLX_GRND_LAKE','FATES_DEMOTION_CARBONFLUX','FATES_EXCESS_RESP','FATES_MAINT_RESP_UNREDUCED','FATES_PRIMARY_PATCHFUSION_ERR','FATES_PROMOTION_CARBONFLUX','FATES_SEEDS_IN_LOCAL','FATES_UNGERM_SEED_BANK','HEAT_FROM_AC','HIA','HIA_R','HIA_U','HUMIDEX','HUMIDEX_R','HUMIDEX_U','LAKEICEFRAC_SURF','LAKEICETHICK','LNC','MORTALITY_CROWNAREA_CANOPY','MORTALITY_CROWNAREA_UNDERSTORY','QIRRIG_FROM_GW_CONFINED','QIRRIG_FROM_GW_UNCONFINED','QIRRIG_FROM_SURFACE','RSSHA','RSSUN','SWBGT','SWBGT_U','SWBGT_R','TBUILD','URBAN_AC','URBAN_HEAT','WASTEHEAT','WBT','WBT_R','WBT_U','FPG','FSH_R','F_DENIT','F_N2O_DENIT','F_N2O_NIT','F_NIT','GROSS_NMIN','HEAT_FROM_AC','HIA_R','HIA_U','HUMIDEX_R','HUMIDEX_U','LITTERC_HR','LIT_CEL_N','LIT_LIG_N','LIT_LIG_C','LIT_MET_C','LIT_MET_N','MORTALITY_CROWNAREA_CANOPY','MORTALITY_CROWNAREA_UNDERSTORY','NDEP_TO_SMINN','NET_NMIN','NFIX_TO_SMINN','POTENTIAL_IMMOB','POT_F_DENIT','POT_F_NIT','QIRRIG_FROM_GW_CONFINED','QIRRIG_FROM_GW_UNCONFINED','QIRRIG_FROM_SURFACE','SMINN_TO_PLANT','SMIN_NH4','SMIN_NO3','SMIN_NO3_LEACHED','SMIN_NO3_RUNOFF','SOM_ACT_C','SOM_ACT_N','SOM_C_LEACHED','SOM_PAS_C','SOM_PAS_N','SOM_SLO_C','SUPPLEMENT_TO_SMINN','SWBGT_R','SWBGT_U','TOTCOLC','TOTCOLN','TOTECOSYSC','TOTECOSYSN','TOTLITC','TOTLITC_1m','TOTLITN','TOTLITN_1m','TOTSOMC','TOTSOMN','TOT_WOODPRODC','TOT_WOODPRODC_LOSS','TOT_WOODPRODN','TOT_WOODPRODN_LOSS','WASTEHEAT','WBT','WBT_U','WBT_R','DWT_WOODPRODN_GAIN','VENTILATION','LIT_LIG_N_vr','LIT_LIG_N_vr','LIT_MET_N_vr','LIT_CEL_N_vr','SOILN_vr','SOM_ACT_N_vr','SOM_PAS_N_vr','SOM_SLO_N_vr','SMINN_vr','SMIN_NO3_vr','DWT_WOODPRODC_GAIN','EFLX_LH_TOT_R','LAISHA','LAISUN','SMINN','TOTSOMN_1m','SMIN_NH4_vr'" >> user_nl_clm 
+fi 
+