Resolve merge conflict with master.

Merge branch 'master' into rgknox-warns-threadtests

Resolve a trivial merge conflict in testlist_clm.xml

Test: SMS_D_Ld5.f10_f10.ICLM45ED.yellowstone_intel.clm-edTest
Test baseline: none
Teststatus: passed

components/clm/bld/namelist_files/namelist_defaults_clm4_5.xml

@@ -1973,6 +1973,6 @@ lnd/clm2/surfdata_map/surfdata_ne120np4_78pfts_simyr1850_c160216.nc</fsurdat>
 <use_lch4            bgc_mode="ed"  >.false.</use_lch4>
 <use_nitrif_denitrif bgc_mode="ed"  >.false.</use_nitrif_denitrif>
 
-<use_ed_spit_fire    use_ed=".true.">.true.</use_ed_spit_fire>
+<use_ed_spit_fire    use_ed=".true.">.false.</use_ed_spit_fire>
 
 </namelist_defaults>

components/clm/cime_config/testdefs/testlist_clm.xml

@@ -724,7 +724,7 @@
     <grid name="f10_f10">
       <test name="ERS_D_Ld5">
         <machine compiler="ed" testtype="ed" testmods="clm/edTest">ed</machine>
-        <machine compiler="ed" testtype="ed" testmods="clm/edNoFire">ed</machine>
+        <machine compiler="ed" testtype="ed" testmods="clm/edFire">ed</machine>
         <machine compiler="nag" testtype="aux_clm45" testmods="clm/edTest">hobart</machine>
         <machine compiler="ed" testtype="ed" testmods="clm/edTest">hobart</machine>
         <machine compiler="intel" testtype="aux_clm45" testmods="clm/edTest">yellowstone</machine>

components/clm/cime_config/testdefs/testmods_dirs/clm/edFire/user_nl_clm

@@ -0,0 +1,2 @@
+use_ed_spit_fire  = .true.
+

components/clm/src/ED/fire/SFMainMod.F90

@@ -52,11 +52,8 @@ subroutine fire_model( currentSite, atm2lnd_inst, temperature_inst)
 
     type (ed_patch_type), pointer :: currentPatch
 
-    integer temporary_SF_switch
-
     !zero fire things
     currentPatch => currentSite%youngest_patch
-    temporary_SF_switch = 0
     do while(associated(currentPatch))
        currentPatch%frac_burnt = 0.0_r8
        currentPatch%AB         = 0.0_r8
@@ -68,7 +65,7 @@ subroutine fire_model( currentSite, atm2lnd_inst, temperature_inst)
        write(iulog,*) 'use_ed_spit_fire',use_ed_spit_fire
     endif
 
-    if(use_ed_spit_fire.and.temporary_SF_switch==1)then
+    if(use_ed_spit_fire)then
        call fire_danger_index(currentSite, temperature_inst, atm2lnd_inst)
        call wind_effect(currentSite, atm2lnd_inst)
        call charecteristics_of_fuel(currentSite)
@@ -222,7 +219,7 @@ subroutine  charecteristics_of_fuel ( currentSite )
           ! average water content !is this the correct metric?         
           timeav_swc                  = sum(currentSite%water_memory(1:10)) / 10._r8 
           ! Equation B2 in Thonicke et al. 2010
-          fuel_moisture(dg_sf)        = max(0.0_r8, 10.0_r8/9._r8 * timeav_swc - 1.0_r8/9.0_r8)           
+          fuel_moisture(lg_sf)        = max(0.0_r8, 10.0_r8/9._r8 * timeav_swc - 1.0_r8/9.0_r8)           
 
           ! Average properties over the first four litter pools (dead leaves, twigs, s branches, l branches) 
           currentPatch%fuel_bulkd     = sum(currentPatch%fuel_frac(dg_sf:lb_sf) * SF_val_FBD(dg_sf:lb_sf))     
@@ -363,7 +360,7 @@ subroutine  wind_effect ( currentSite, atm2lnd_inst)
 
     do while(associated(currentPatch))       
        currentPatch%total_tree_area = min(currentPatch%total_tree_area,currentPatch%area)      
-       currentPatch%effect_wspeed = wind * (tree_fraction*0.6+grass_fraction*0.4+bare_fraction*1.0)
+       currentPatch%effect_wspeed = wind * (tree_fraction*0.4+(grass_fraction+bare_fraction)*0.6)
 
        currentPatch => currentPatch%younger
     enddo !end patch loop