Merge boundary condition passing, commit 'bd4719b', into

andre-ed-clm-16x.

Test suite: ed - yellowstone intel, gnu, pgi
            clm_short - yellowstone intel, gnu, pgi

Test baseline: none, orginial branch was answer changing.

Test status: all tests pass. expected fail in #88, ERS_D
ICLMED yellowstone_gnu unexpectedly passed.

biogeochem/EDPhysiologyMod.F90

@@ -70,7 +70,7 @@ subroutine canopy_derivs( currentPatch )
   end subroutine canopy_derivs
 
   ! ============================================================================
-  subroutine non_canopy_derivs( currentPatch, temperature_inst, soilstate_inst, waterstate_inst)
+  subroutine non_canopy_derivs( currentPatch, temperature_inst )
     !
     ! !DESCRIPTION:
     ! Returns time differentials of the state vector
@@ -80,8 +80,6 @@ subroutine non_canopy_derivs( currentPatch, temperature_inst, soilstate_inst, wa
     ! !ARGUMENTS    
     type(ed_patch_type)    , intent(inout) :: currentPatch
     type(temperature_type) , intent(in)    :: temperature_inst
-    type(soilstate_type)   , intent(in)    :: soilstate_inst
-    type(waterstate_type)  , intent(in)    :: waterstate_inst
     !
     ! !LOCAL VARIABLES:
     integer c,p
@@ -108,7 +106,7 @@ subroutine non_canopy_derivs( currentPatch, temperature_inst, soilstate_inst, wa
 
     ! update fragmenting pool fluxes
     call cwd_input(currentPatch)
-    call cwd_out( currentPatch, temperature_inst, soilstate_inst, waterstate_inst)
+    call cwd_out( currentPatch, temperature_inst)
 
     do p = 1,numpft_ed
        currentPatch%dseed_dt(p) = currentPatch%seeds_in(p) - currentPatch%seed_decay(p) - currentPatch%seed_germination(p)
@@ -244,7 +242,7 @@ subroutine phenology( currentSite, temperature_inst, waterstate_inst)
     !
     ! !USES:
     use clm_varcon, only : tfrz
-    use clm_time_manager, only : get_days_per_year, get_curr_date
+    use clm_time_manager, only : get_curr_date
     use clm_time_manager, only : get_ref_date, timemgr_datediff 
     use EDTypesMod, only : udata
     use PatchType , only : patch   
@@ -1145,7 +1143,7 @@ subroutine fragmentation_scaler( currentPatch, temperature_inst )
     ! !USES:
     use shr_const_mod      , only : SHR_CONST_PI, SHR_CONST_TKFRZ
     use EDSharedParamsMod  , only : EDParamsShareInst
-    use PatchType , only : patch 
+
     !
     ! !ARGUMENTS    
     type(ed_patch_type)    , intent(inout) :: currentPatch
@@ -1154,7 +1152,7 @@ subroutine fragmentation_scaler( currentPatch, temperature_inst )
     ! !LOCAL VARIABLES:
     logical  :: use_century_tfunc = .false.
     type(ed_site_type), pointer :: currentSite
-    integer  :: c,p,j
+    integer  :: p,j
     real(r8) :: t_scalar
     real(r8) :: w_scalar
     real(r8) :: catanf                ! hyperbolic temperature function from CENTURY
@@ -1173,7 +1171,6 @@ subroutine fragmentation_scaler( currentPatch, temperature_inst )
 
 !    c = currentPatch%siteptr%clmcolumn
     p = currentPatch%clm_pno
-    c = patch%column(p)
 
     ! set "froz_q10" parameter
     froz_q10  = EDParamsShareInst%froz_q10  
@@ -1204,7 +1201,7 @@ subroutine fragmentation_scaler( currentPatch, temperature_inst )
   end subroutine fragmentation_scaler
 
   ! ============================================================================
-  subroutine cwd_out( currentPatch, temperature_inst, soilstate_inst, waterstate_inst)
+  subroutine cwd_out( currentPatch, temperature_inst )
     !
     ! !DESCRIPTION:
     ! Simple CWD fragmentation Model
@@ -1217,8 +1214,6 @@ subroutine cwd_out( currentPatch, temperature_inst, soilstate_inst, waterstate_i
     ! !ARGUMENTS    
     type(ed_patch_type)    , intent(inout), target :: currentPatch
     type(temperature_type) , intent(in)            :: temperature_inst
-    type(soilstate_type)   , intent(in)            :: soilstate_inst
-    type(waterstate_type)  , intent(in)            :: waterstate_inst
     !
     ! !LOCAL VARIABLES:
     type(ed_site_type), pointer :: currentSite

biogeophys/EDAccumulateFluxesMod.F90

@@ -55,6 +55,11 @@ subroutine AccumulateFluxes_ED(bounds, p, sites, nsites, hsites , photosyns_inst
          psncanopy => photosyns_inst%psncanopy_patch   & ! Output: [real(r8) (:,:)] canopy scale photosynthesis umol CO2 /m**2/ s
          )
 
+
+      ! INTERF-TODO:  WHY IS THIS BEING UPDATED?
+      ! IT IS JUST GOING TO BE ZEROED A THE END OF THE FUNCTION
+      ! THAT CALLS THIS SUBROUTINE (CANOPYFLUXES), AND IT WON'T
+      ! BE USED BETWEEN NOW AND THEN
       fpsn(p) = psncanopy(p)
 
       if (patch%is_veg(p)) then