zero fire variables in SFMain not EDCOhortDynamics

jkshuman · Sep 12, 2019 · 8b44706 · 8b44706
1 parent fa2d3dd
commit 8b44706
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/biogeochem/EDCohortDynamicsMod.F90 b/biogeochem/EDCohortDynamicsMod.F90
@@ -579,7 +579,6 @@ subroutine zero_cohort(cc_p)
 
     currentcohort%year_net_uptake(:) = 999._r8 ! this needs to be 999, or trimming of new cohorts will break. 
     currentcohort%ts_net_uptake(:)   = 0._r8
-    currentcohort%fraction_crown_burned = 0._r8 
     currentCohort%size_class            = 1
     currentCohort%seed_prod          = 0._r8
     currentCohort%size_class_lasttimestep = 0
@@ -595,8 +594,6 @@ subroutine zero_cohort(cc_p)
     currentCohort%leaf_cost          = 0._r8
     currentcohort%excl_weight        = 0._r8
     currentcohort%prom_weight        = 0._r8
-    currentcohort%crownfire_mort     = 0._r8
-    currentcohort%cambial_mort       = 0._r8
     currentCohort%c13disc_clm        = 0._r8 
     currentCohort%c13disc_acc        = 0._r8
 

diff --git a/fire/SFMainMod.F90 b/fire/SFMainMod.F90
@@ -962,7 +962,8 @@ subroutine  cambial_damage_kill ( currentSite )
 
        if (currentPatch%fire == 1) then
           currentCohort => currentPatch%tallest;
-          do while(associated(currentCohort))  
+          do while(associated(currentCohort))
+             currentCohort%cambial_mort = 0.0_r8
              if (EDPftvarcon_inst%woody(currentCohort%pft) == 1) then !trees only
                 ! Equation 21 in Thonicke et al 2010
                 bt = EDPftvarcon_inst%bark_scaler(currentCohort%pft)*currentCohort%dbh ! bark thickness. 
@@ -974,8 +975,6 @@ subroutine  cambial_damage_kill ( currentSite )
                 else
                    if ((currentPatch%tau_l/tau_c) > 0.22_r8) then
                       currentCohort%cambial_mort = (0.563_r8*(currentPatch%tau_l/tau_c)) - 0.125_r8
-                   else
-                      currentCohort%cambial_mort = 0.0_r8
                    endif
                 endif
              endif !trees