Import ed_v0.1.0 unstable science changes.

Created a patch file of changes Rosie considered unstable science from the ed_v0.1.0 branch: svn diff -r68491:r72748 \ https://svn-ccsm-models.cgd.ucar.edu/clm2/branches/ed_v0.1.0/ > \ ed_v0.1.0-buggy-science.patch Patch applied cleanly. Testing: Branch has not been compiled or tested.
NGEET · Dec 15, 2015 · 2b650b7 · 2b650b7
1 parent e840829
commit 2b650b7
Show file tree

Hide file tree

Showing 6 changed files with 771 additions and 16 deletions.
diff --git a/biogeochem/EDBGCDynMod.F90 b/biogeochem/EDBGCDynMod.F90
diff --git a/biogeochem/EDPatchDynamicsMod.F90 b/biogeochem/EDPatchDynamicsMod.F90
@@ -1020,7 +1020,7 @@ subroutine fuse_patches( csite )
        if(nopatches > maxpatch)then
           iterate = 1
           profiletol = profiletol * 1.1_r8
-          write(iulog,*) 'maxpatch exceeded, triggering patch fusion iteration.',profiletol,nopatches
+
           !---------------------------------------------------------------------!
           ! Making profile tolerance larger means that more fusion will happen  !
           !---------------------------------------------------------------------!        

diff --git a/biogeochem/EDPhysiologyMod.F90 b/biogeochem/EDPhysiologyMod.F90
@@ -120,14 +120,14 @@ subroutine non_canopy_derivs( currentPatch, temperature_inst, soilstate_inst, wa
        currentPatch%droot_litter_dt(p) = currentPatch%root_litter_in(p) - currentPatch%root_litter_out(p) 
     enddo
 
-    currentPatch%leaf_litter_in(:)  = 0.0_r8
-    currentPatch%root_litter_in(:)  = 0.0_r8
-    currentPatch%leaf_litter_out(:) = 0.0_r8
-    currentPatch%root_litter_out(:) = 0.0_r8
-    currentPatch%CWD_AG_in(:)       = 0.0_r8
-    currentPatch%cwd_bg_in(:)       = 0.0_r8
-    currentPatch%CWD_AG_out(:)      = 0.0_r8
-    currentPatch%cwd_bg_out(:)      = 0.0_r8
+    ! currentPatch%leaf_litter_in(:)  = 0.0_r8
+    ! currentPatch%root_litter_in(:)  = 0.0_r8
+    ! currentPatch%leaf_litter_out(:) = 0.0_r8
+    ! currentPatch%root_litter_out(:) = 0.0_r8
+    ! currentPatch%CWD_AG_in(:)       = 0.0_r8
+    ! currentPatch%cwd_bg_in(:)       = 0.0_r8
+    ! currentPatch%CWD_AG_out(:)      = 0.0_r8
+    ! currentPatch%cwd_bg_out(:)      = 0.0_r8
 
   end subroutine non_canopy_derivs
 
@@ -1174,4 +1174,6 @@ subroutine cwd_out( currentPatch, temperature_inst, soilstate_inst, waterstate_i
 
   end subroutine cwd_out
 
+
+
 end module EDPhysiologyMod
diff --git a/biogeophys/EDSurfaceAlbedoMod.F90 b/biogeophys/EDSurfaceAlbedoMod.F90
@@ -849,10 +849,10 @@ subroutine ED_Norman_Radiation (bounds, &
                             enddo
                          enddo
                          if (lai_change(1,2,1).gt.0.0.and.lai_change(1,2,2).gt.0.0)then
-                             write(iulog,*) 'lai_change(1,2,12)',lai_change(1,2,1:4)
+!                             write(iulog,*) 'lai_change(1,2,12)',lai_change(1,2,1:4)
                          endif
                          if (lai_change(1,2,2).gt.0.0.and.lai_change(1,2,3).gt.0.0)then
-                             write(iulog,*) ' lai_change (1,2,23)',lai_change(1,2,1:4)
+!                             write(iulog,*) ' lai_change (1,2,23)',lai_change(1,2,1:4)
                          endif
                          if (lai_change(1,1,3).gt.0.0.and.lai_change(1,1,2).gt.0.0)then
                             ! write(iulog,*) 'first layer of lai_change 2 3',lai_change(1,1,1:3)