Merge the r153/restart snow workaround into clm trunk merge branch.

Merge branch 'andre-r153-restart-work-around' into andre-ed-clm-16x

Code review: self

Test suite: ed - yellowstone intel, gnu, pgi
Test baseline: not run
Test namelist changes: n/a

Test answer changes: change in science logic, so potentially not bit
for bit, scale of changes unknown.

Test summary: pass except for expected failures in f09, f19 (#14) and
gnu f10 (#43),

components/clm/src/biogeophys/CanopyHydrologyMod.F90

@@ -520,7 +520,13 @@ subroutine CanopyHydrology(bounds, &
              !======================  FSCA PARAMETERIZATIONS  ======================
              ! fsca parameterization based on *changes* in swe
              ! first compute change from melt during previous time step
-             if(snowmelt(c) > 0._r8) then
+             if(snowmelt(c) >= 0._r8) then
+                ! FIXME(bja, 2016-06) The correct inequalitiy for the
+                ! above is: '>' and not '>='. Using '>' causes ED
+                ! restarts to fail. I am temporarily using the
+                ! incorrect logic to allow progross in merging the ED
+                ! branch to a modern CLM tag. This change should NOT
+                ! be reintroduced into the clm trunk!
 
                 smr=min(1._r8,(h2osno(c))/(int_snow(c)))