Merge branch 'andre-r178-merge-bugfix' into andre-ed-clm-16x

NGEET · Jun 13, 2016 · 6dfd39d · 6dfd39d
2 parents 258d2c6 + 7107a26
commit 6dfd39d
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/components/clm/src/biogeophys/TemperatureType.F90 b/components/clm/src/biogeophys/TemperatureType.F90
@@ -1106,9 +1106,6 @@ subroutine InitAccBuffer (this, bounds)
             subgrid_type='pft', numlev=1, init_value=SHR_CONST_TKFRZ)
     end if
 
-<<<<<<< HEAD
-    if ( crop_prog )then
-=======
     if ( use_ed ) then
 
        call init_accum_field (name='ED_GDD0', units='K', &
@@ -1118,7 +1115,6 @@ subroutine InitAccBuffer (this, bounds)
     end if
 
     if ( use_crop )then
->>>>>>> 17ae361c
 
        ! All GDD summations are relative to the planting date (Kucharik & Brye 2003)
        call init_accum_field (name='GDD0', units='K', &
@@ -1222,16 +1218,12 @@ subroutine InitAccVars(this, bounds)
        this%t_ref2m_min_inst_u_patch(begp:endp) =  spval
     end if
 
-<<<<<<< HEAD
-    if ( crop_prog ) then
-=======
     if ( use_ed ) then
        call extract_accum_field ('ED_GDD0', rbufslp, nstep)
        this%gdd0_patch(begp:endp) = rbufslp(begp:endp)
     end if
 
     if ( use_crop ) then
->>>>>>> 17ae361c
 
        call extract_accum_field ('GDD0', rbufslp, nstep)
        this%gdd0_patch(begp:endp) = rbufslp(begp:endp)