Correcting missed conflicts

Missed a conflict with the parameter file. Also need to remove the recent addition of harvest_carbon_flux initialization.
rgknox · Mar 30, 2022 · 5427615 · 5427615
1 parent 241b7c5
commit 5427615
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 5 deletions.
diff --git a/main/EDInitMod.F90 b/main/EDInitMod.F90
@@ -203,7 +203,6 @@ subroutine zero_site( site_in )
 
     ! Disturbance rates tracking
     site_in%primary_land_patchfusion_error = 0.0_r8
-    site_in%harvest_carbon_flux = 0.0_r8
     site_in%potential_disturbance_rates(:) = 0.0_r8
     site_in%disturbance_rates_secondary_to_secondary(:) = 0.0_r8
     site_in%disturbance_rates_primary_to_secondary(:) = 0.0_r8

diff --git a/parameter_files/fates_params_default.cdl b/parameter_files/fates_params_default.cdl
@@ -1446,14 +1446,10 @@ data:
 
  fates_logging_mechanical_frac = 0.05 ;
 
-<<<<<<< HEAD
  fates_pprodharv10_forest_mean = 0.8125 ;
 
-||||||| 36e60bb3
-=======
  fates_maintresp_model = 1 ;
 
->>>>>>> master
  fates_mort_disturb_frac = 1 ;
 
  fates_mort_understorey_death = 0.55983 ;