Merge branch 'master' into releasetest

NordicESMhub · Apr 12, 2018 · 50b1b63 · 50b1b63
2 parents d0ebb70 + 70558e9
commit 50b1b63
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/biogeochem/EDPatchDynamicsMod.F90 b/biogeochem/EDPatchDynamicsMod.F90
@@ -1345,6 +1345,8 @@ subroutine fuse_patches( csite, bc_in )
     !
     !---------------------------------------------------------------------
 
+    maxpatch = maxPatchesPerSite
+
     currentSite => csite 
 
     profiletol = ED_val_patch_fusion_tol

diff --git a/main/EDTypesMod.F90 b/main/EDTypesMod.F90
@@ -266,7 +266,6 @@ module EDTypesMod
         procedure, public :: b_total
 
      end type ed_cohort_type
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -266,7 +266,6 @@ module EDTypesMod
		procedure, public :: b_total

		end type ed_cohort_type




Expand Down