fixed error in merge commit

ckoven · Oct 18, 2018 · e2775c2 · e2775c2
1 parent 5103618
commit e2775c2
Showing 1 changed file with 2 additions and 49 deletions.
diff --git a/biogeochem/EDCohortDynamicsMod.F90 b/biogeochem/EDCohortDynamicsMod.F90
@@ -345,55 +345,6 @@ subroutine zero_cohort(cc_p)
 
     currentCohort => cc_p
 
-<<<<<<< HEAD
-    currentCohort%NV                 = 0    
-    currentCohort%status_coh         = 0    
-    currentCohort%rdark              = 0._r8
-    currentCohort%resp_m             = 0._r8 
-    currentCohort%resp_g             = 0._r8
-    currentCohort%livestem_mr        = 0._r8
-    currentCohort%livecroot_mr       = 0._r8
-    currentCohort%froot_mr           = 0._r8
-    currentCohort%fire_mort          = 0._r8 
-    currentcohort%npp_acc            = 0._r8
-    currentcohort%gpp_acc            = 0._r8
-    currentcohort%resp_acc           = 0._r8
-    currentcohort%npp_tstep          = 0._r8
-    currentcohort%gpp_tstep          = 0._r8
-    currentcohort%resp_tstep         = 0._r8
-    currentcohort%resp_acc_hold      = 0._r8
-    currentcohort%leaf_litter        = 0._r8
-    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%seed_prod          = 0._r8
-    currentcohort%cfa                = 0._r8 
-    currentcohort%md                 = 0._r8
-    currentcohort%root_md            = 0._r8
-    currentcohort%leaf_md            = 0._r8
-    currentcohort%bstore_md          = 0._r8
-    currentcohort%bsw_md             = 0._r8
-    currentcohort%bdead_md           = 0._r8
-    currentcohort%npp_acc_hold       = 0._r8 
-    currentcohort%gpp_acc_hold       = 0._r8  
-    currentcohort%dmort              = 0._r8 
-    currentcohort%g_sb_laweight      = 0._r8 
-    currentcohort%treesai            = 0._r8  
-    currentCohort%lmort_direct       = 0._r8
-    currentCohort%lmort_infra        = 0._r8
-    currentCohort%lmort_collateral   = 0._r8
-    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%npp_leaf = 0._r8
-    currentCohort%npp_fnrt = 0._r8
-    currentCohort%npp_sapw = 0._r8
-    currentCohort%npp_dead = 0._r8
-    currentCohort%npp_seed = 0._r8
-    currentCohort%npp_stor = 0._r8
-    currentCohort%size_class = 1
-    currentCohort%size_class_lasttimestep = 0
     currentCohort%NV                    = 0    
     currentCohort%status_coh            = 0    
     currentCohort%rdark                 = 0._r8
@@ -440,6 +391,8 @@ subroutine zero_cohort(cc_p)
     currentCohort%npp_dead              = 0._r8
     currentCohort%npp_seed              = 0._r8
     currentCohort%npp_stor              = 0._r8
+    currentCohort%size_class            = 1
+    currentCohort%size_class_lasttimestep = 0
 
   end subroutine zero_cohort