Merge pull request NGEET#594 from jkshuman/fire-threshold

SPITFIRE - ignitions, area burn, intensity, scorch height
rgknox · Feb 4, 2020 · fbbcafd · fbbcafd
2 parents 4b35015 + 931824c
commit fbbcafd
Show file tree

Hide file tree

Showing 7 changed files with 137 additions and 141 deletions.
diff --git a/biogeochem/EDCohortDynamicsMod.F90 b/biogeochem/EDCohortDynamicsMod.F90
@@ -1669,7 +1669,7 @@ subroutine copy_cohort( currentCohort,copyc )
     n%dhdt            = o%dhdt
     n%ddbhdt          = o%ddbhdt
 
-    ! FIRE 
+    ! FIRE
     n%fraction_crown_burned = o%fraction_crown_burned
     n%fire_mort             = o%fire_mort
     n%crownfire_mort        = o%crownfire_mort

diff --git a/biogeochem/EDPatchDynamicsMod.F90 b/biogeochem/EDPatchDynamicsMod.F90
@@ -1883,6 +1883,7 @@ subroutine create_patch(currentSite, new_patch, age, areap, label)
     new_patch%fabd_sha_z(:,:,:)  = 0._r8 
     new_patch%fabi_sun_z(:,:,:)  = 0._r8 
     new_patch%fabi_sha_z(:,:,:)  = 0._r8  
+    new_patch%scorch_ht(:)       = 0._r8  
     new_patch%frac_burnt         = 0._r8  
     new_patch%total_tree_area    = 0.0_r8  
     new_patch%NCL_p              = 1
@@ -1980,7 +1981,7 @@ subroutine zero_patch(cp_p)
     currentPatch%fire                       = 999    ! sr decide_fire.1=fire hot enough to proceed. 0=stop everything- no fires today
     currentPatch%fd                         = 0.0_r8 ! fire duration (mins)
     currentPatch%ros_back                   = 0.0_r8 ! backward ros (m/min)
-    currentPatch%sh                         = 0.0_r8 ! average scorch height for the patch(m)
+    currentPatch%scorch_ht(:)               = 0.0_r8 ! scorch height of flames on a given PFT
     currentPatch%frac_burnt                 = 0.0_r8 ! fraction burnt daily  
     currentPatch%burnt_frac_litter(:)       = 0.0_r8 
     currentPatch%btran_ft(:)                = 0.0_r8
@@ -2296,7 +2297,7 @@ subroutine fuse_2_patches(csite, dp, rp)
     rp%fi                   = (dp%fi*dp%area + rp%fi*rp%area) * inv_sum_area
     rp%fd                   = (dp%fd*dp%area + rp%fd*rp%area) * inv_sum_area
     rp%ros_back             = (dp%ros_back*dp%area + rp%ros_back*rp%area) * inv_sum_area
-    rp%sh                   = (dp%sh*dp%area + rp%sh*rp%area) * inv_sum_area
+    rp%scorch_ht(:)         = (dp%scorch_ht(:)*dp%area + rp%scorch_ht(:)*rp%area) * inv_sum_area
     rp%frac_burnt           = (dp%frac_burnt*dp%area + rp%frac_burnt*rp%area) * inv_sum_area
     rp%burnt_frac_litter(:) = (dp%burnt_frac_litter(:)*dp%area + rp%burnt_frac_litter(:)*rp%area) * inv_sum_area
     rp%btran_ft(:)          = (dp%btran_ft(:)*dp%area + rp%btran_ft(:)*rp%area) * inv_sum_area