Merge branch 'dont_terminate_in_canopy' into lower_termination_threshold

NGEET · Feb 23, 2017 · 37ba5ce · 37ba5ce
2 parents c2d67ac + 4157e60
commit 37ba5ce
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/components/clm/src/ED/biogeochem/EDCanopyStructureMod.F90 b/components/clm/src/ED/biogeochem/EDCanopyStructureMod.F90
@@ -295,7 +295,6 @@ subroutine canopy_structure( currentSite )
                               !currentCohort%canopy_layer,currentCohort%dbh
 
                       endif
-                     ! call terminate_cohorts(currentPatch) 
 
                       !----------- End of cohort splitting ------------------------------!             
                    endif !canopy layer = i
@@ -304,7 +303,6 @@ subroutine canopy_structure( currentSite )
 
                 enddo !currentCohort 
 
-                call terminate_cohorts(currentPatch)
                 arealayer(i) = arealayer(i) - sumloss
                 !Update arealayer for diff calculations of layer below. 
                 arealayer(i + 1) = arealayer(i + 1) + sumloss 
@@ -340,7 +338,6 @@ subroutine canopy_structure( currentSite )
 
        enddo !is there still excess area in any layer?      
 
-       call terminate_cohorts(currentPatch)
        call fuse_cohorts(currentPatch)
        call terminate_cohorts(currentPatch)
 
@@ -500,7 +497,6 @@ subroutine canopy_structure( currentSite )
                               !currentCohort%pft,currentPatch%patchno
 
                       endif
-                      !call terminate_cohorts(currentPatch) 
                       if(promswitch == 1)then
                         ! write(fates_log(),*) 'cohort loop',currentCohort%pft,currentPatch%patchno
                       endif
@@ -562,7 +558,6 @@ subroutine canopy_structure( currentSite )
           endif
        enddo !is there still not enough canopy area in any layer?         
 
-       call terminate_cohorts(currentPatch)
        call fuse_cohorts(currentPatch)
        call terminate_cohorts(currentPatch)