Merge pull request #483 from rosiealice/seedrainfix

removed extra patch loop for seed rain

Author: rgknox

biogeochem/EDPhysiologyMod.F90

@@ -27,7 +27,6 @@ module EDPhysiologyMod
 
   use EDTypesMod          , only : numWaterMem
   use EDTypesMod          , only : dl_sf, dinc_ed
-  use EDTypesMod          , only : external_recruitment
   use EDTypesMod          , only : ncwd
   use EDTypesMod          , only : nlevleaf
   use EDTypesMod          , only : senes
@@ -888,20 +887,14 @@ subroutine seeds_in( currentSite, cp_pnt )
 
     endif
 
-    currentPatch => currentSite%oldest_patch
-
-    do while(associated(currentPatch))
-       if (external_recruitment == 1) then !external seed rain - needed to prevent extinction  
-          do p = 1,numpft
-           currentPatch%seeds_in(p) = currentPatch%seeds_in(p) + &
+    do p = 1,numpft
+       currentPatch%seeds_in(p) = currentPatch%seeds_in(p) + &
                  EDPftvarcon_inst%seed_rain(p) !KgC/m2/year
-           currentSite%seed_rain_flux(p) = currentSite%seed_rain_flux(p) + &
+       currentSite%seed_rain_flux(p) = currentSite%seed_rain_flux(p) + &
                  EDPftvarcon_inst%seed_rain(p) * currentPatch%area/AREA !KgC/m2/year
-          enddo
-       endif
-       currentPatch => currentPatch%younger
     enddo
 
+
   end subroutine seeds_in
 
   ! ============================================================================

main/EDTypesMod.F90

@@ -116,7 +116,6 @@ module EDTypesMod
   integer, parameter :: numWaterMem           = 10         ! watermemory saved as site level var
 
   ! BIOLOGY/BIOGEOCHEMISTRY        
-  integer , parameter :: external_recruitment = 0          ! external recruitment flag 1=yes  
   integer , parameter :: SENES                = 10         ! Window of time over which we track temp for cold sensecence (days)
   real(r8), parameter :: dinc_ed              = 1.0_r8     ! size of VAI bins (LAI+SAI)  [CHANGE THIS NAME WITH NEXT INTERFACE
                                                            ! UPDATE]

parameter_files/fates_params_14pfts.cdl

@@ -1136,8 +1136,7 @@ data:
  fates_seed_germination_timescale = 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 
     0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ;
 
- fates_seed_rain = 0.28, 0.28, 0.28, 0.28, 0.28, 0.28, 0.28, 0.28, 0.28, 
-    0.28, 0.28, 0.28, 0.28, 0.28 ;
+ fates_seed_rain =  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ;
 
  fates_smpsc = -255000, -255000, -255000, -255000, -255000, -255000, -255000, 
     -255000, -255000, -255000, -255000, -255000, -255000, -255000 ;

parameter_files/fates_params_coastal_veg.cdl

@@ -846,7 +846,7 @@ data:
 
  fates_seed_germination_timescale = 0.5, 0.5 ;
 
- fates_seed_rain = 0.28, 0.28 ;
+ fates_seed_rain = 0, 0 ;
 
  fates_smpsc = -255000, -255000 ;
 

parameter_files/fates_params_default.cdl

@@ -979,7 +979,7 @@ data:
 
  fates_seed_germination_timescale = 0.5, 0.5 ;
 
- fates_seed_rain = 0.28, 0.28 ;
+ fates_seed_rain = 0.0, 0.0 ;
 
  fates_smpsc = -255000, -255000 ;
 

parameter_files/fates_params_hydro_default.cdl

@@ -979,7 +979,7 @@ data:
 
  fates_seed_germination_timescale = 0.5, 0.5 ;
 
- fates_seed_rain = 0.28, 0.28 ;
+ fates_seed_rain = 0, 0 ;
 
  fates_smpsc = -255000, -255000 ;