From 59e6e6e90dee77cceb37e7ebc31be0fb6fa216bd Mon Sep 17 00:00:00 2001
From: ckoven <ckoven@gmail.com>
Date: Fri, 15 Apr 2016 14:35:31 -0700
Subject: [PATCH] changes to fuse_2_patches to avoid crashing bug

---
 .../src/ED/biogeochem/EDPatchDynamicsMod.F90  | 58 +++++++++++++------
 1 file changed, 41 insertions(+), 17 deletions(-)

diff --git a/components/clm/src/ED/biogeochem/EDPatchDynamicsMod.F90 b/components/clm/src/ED/biogeochem/EDPatchDynamicsMod.F90
index 58c4656c06..8e7f014e39 100755
--- a/components/clm/src/ED/biogeochem/EDPatchDynamicsMod.F90
+++ b/components/clm/src/ED/biogeochem/EDPatchDynamicsMod.F90
@@ -1158,6 +1158,9 @@ subroutine fuse_2_patches(dp, rp)
     type (ed_cohort_type), pointer :: storebigcohort  
     integer :: c,p !counters for pft and litter size class. 
     integer :: tnull,snull  ! are the tallest and shortest cohorts associated?
+    type(ed_patch_type), pointer :: youngerp   ! pointer to the patch younger than donor
+    type(ed_patch_type), pointer :: olderp     ! pointer to the patch older than donor
+    type(ed_site_type),  pointer :: csite      ! pointer to the donor patch's site
     !---------------------------------------------------------------------
 
     !area weighted average of ages & litter & seed bank
@@ -1253,25 +1256,47 @@ subroutine fuse_2_patches(dp, rp)
 
     call patch_pft_size_profile(rp) ! Recalculate the patch size profile for the resulting patch
 
-    ! FIX(SPM,032414) dangerous code here.  Passing in dp as a pointer allows the code below
-    ! to effect the currentPatch that is the actual argument when in reality, dp should be 
-    ! intent in only with these pointers being set on the actual argument
-    ! outside of this routine (in fuse_patches).  basically this should be split
-    ! into a copy, then change pointers, then delete.
-
-    if(associated(dp%younger)) then 
-       dp%younger%older => dp%older
-    else 
-       dp%siteptr%youngest_patch => dp%older !youngest
-    endif
-    if(associated(dp%older)) then 
-       dp%older%younger => dp%younger
-    else 
-       dp%siteptr%oldest_patch => dp%younger  !oldest
-    endif
+    ! Define some aliases for the donor patches younger and older neighbors
+    ! which may or may not exist.  After we set them, we will remove the donor
+    ! And then we will go about re-setting the map.
+    csite => dp%siteptr
+    if(associated(dp%older))then
+       olderp => dp%older
+    else
+       olderp => null()
+    end if
+    if(associated(dp%younger))then
+       youngerp => dp%younger
+    else
+       youngerp => null()
+    end if
 
+    ! We have no need for the dp pointer anymore, we have passed on it's legacy
     deallocate(dp)
 
+
+    if(associated(youngerp))then
+       ! Update the younger patch's new older patch (because it isn't dp anymore)
+       youngerp%older => olderp
+    else
+       ! There was no younger patch than dp, so the head of the young order needs
+       ! to be set, and it is set as the patch older than dp.  That patch
+       ! already knows it's older patch (so no need to set or change it)
+       csite%youngest_patch => olderp
+    end if
+
+    
+    if(associated(olderp))then
+       ! Update the older patch's new younger patch (becuase it isn't dp anymore)
+       olderp%younger => youngerp
+    else
+       ! There was no patch older than dp, so the head of the old patch order needs
+       ! to be set, and it is set as the patch younger than dp.  That patch already
+       ! knows it's younger patch, no need to set
+       csite%oldest_patch => youngerp
+    end if
+
+
   end subroutine fuse_2_patches
 
   ! ============================================================================
@@ -1305,7 +1330,6 @@ subroutine terminate_patches(cs_pnt)
              write(iulog,*) 'fusing patches because one is too small',currentPatch%area, currentPatch%lai, &
                   currentPatch%older%area,currentPatch%older%lai,currentPatch%seed_bank(1)
              call fuse_2_patches(currentPatch%older, currentPatch)
-             deallocate(currentPatch%older)
              write(iulog,*) 'after fusion',currentPatch%area,currentPatch%seed_bank(1)
            endif
        endif