Merge pull request #1433 from ckoven/remove_trunk_product_var_v2

remove trunk_product_site variable

Author: glemieux

biogeochem/EDLoggingMortalityMod.F90

@@ -1145,9 +1145,6 @@ subroutine logging_litter_fluxes(currentSite, currentPatch, newPatch, patch_site
          ! This portion is known as "trunk_product_site
 
          if(element_id .eq. carbon12_element) then
-            currentSite%resources_management%trunk_product_site  = &
-                  currentSite%resources_management%trunk_product_site + &
-                  trunk_product_site
 
             currentSite%resources_management%delta_litter_stock  = &
                   currentSite%resources_management%delta_litter_stock + &

biogeochem/EDPatchDynamicsMod.F90

@@ -2593,8 +2593,6 @@ subroutine landusechange_litter_fluxes(currentSite, currentPatch, &
     integer  :: pft                  ! loop index for plant functional types
     integer  :: dcmpy                ! loop index for decomposability pool
     integer  :: element_id           ! parteh compatible global element index
-    real(r8) :: trunk_product_site   ! flux of carbon in trunk products exported off site      [ kgC/site ]
-                                     ! (note we are accumulating over the patch, but scale is site level)
     real(r8) :: woodproduct_mass     ! mass that ends up in wood products [kg]
 
     !---------------------------------------------------------------------
@@ -2637,9 +2635,6 @@ subroutine landusechange_litter_fluxes(currentSite, currentPatch, &
 
        do el = 1,num_elements
 
-          ! Zero some site level accumulator diagnsotics
-          trunk_product_site  = 0.0_r8
-
           element_id = element_list(el)
           site_mass  => currentSite%mass_balance(el)
           elflux_diags => currentSite%flux_diags%elem(el)
@@ -2773,9 +2768,6 @@ subroutine landusechange_litter_fluxes(currentSite, currentPatch, &
 
                    site_mass%burn_flux_to_atm = site_mass%burn_flux_to_atm + burned_mass
 
-                   trunk_product_site = trunk_product_site + &
-                        woodproduct_mass
-
                    ! Amount of trunk mass exported off site [kg/m2]
                    elflux_diags%exported_harvest = elflux_diags%exported_harvest + &
                         woodproduct_mass * area_inv
@@ -2792,15 +2784,6 @@ subroutine landusechange_litter_fluxes(currentSite, currentPatch, &
              currentCohort => currentCohort%taller
           enddo
 
-          ! Update the amount of carbon exported from the site through logging.
-
-          if(element_id .eq. carbon12_element) then
-             currentSite%resources_management%trunk_product_site  = &
-                  currentSite%resources_management%trunk_product_site + &
-                  trunk_product_site
-          end if
-
-
        end do
 
     end if clear_veg_if

biogeochem/EDPhysiologyMod.F90

@@ -3149,10 +3149,6 @@ subroutine CWDInput( currentSite, currentPatch, litt, bc_in)
                (leaf_m + fnrt_m + store_m ) * &
                (dead_n_ilogging+dead_n_dlogging) *currentPatch%area
 
-          currentSite%resources_management%trunk_product_site = &
-               currentSite%resources_management%trunk_product_site + &
-               trunk_wood * logging_export_frac * currentPatch%area
-
           do c = 1,ncwd
              currentSite%resources_management%delta_litter_stock  = &
                   currentSite%resources_management%delta_litter_stock + &

main/EDInitMod.F90

@@ -359,7 +359,6 @@ subroutine zero_site( site_in )
     ! Resources management (logging/harvesting, etc)
     site_in%resources_management%harvest_debt = 0.0_r8
     site_in%resources_management%harvest_debt_sec = 0.0_r8
-    site_in%resources_management%trunk_product_site  = 0.0_r8
 
     ! canopy spread
     site_in%spread = 0._r8

main/EDTypesMod.F90

@@ -137,7 +137,6 @@ module EDTypesMod
   !************************************
   type, public :: ed_resources_management_type
 
-     real(r8) ::  trunk_product_site                       ! Actual  trunk product at site level KgC/site
      real(r8) ::  harvest_debt                             ! the amount of kgC per site that did not successfully harvested 
      real(r8) ::  harvest_debt_sec                         ! the amount of kgC per site from secondary patches that did
                                                            ! not successfully harvested

main/FatesHistoryInterfaceMod.F90

@@ -430,7 +430,6 @@ module FatesHistoryInterfaceMod
   integer :: ih_froot_mr_si
   integer :: ih_livestem_mr_si
   integer :: ih_livecroot_mr_si
-  integer :: ih_woodproduct_si
   integer :: ih_h2oveg_si
   integer :: ih_h2oveg_dead_si
   integer :: ih_h2oveg_recruit_si
@@ -2470,7 +2469,6 @@ subroutine update_history_dyn_sitelevel(this,nc,nsites,sites)
          hio_promotion_carbonflux_si       => this%hvars(ih_promotion_carbonflux_si)%r81d, &
          hio_canopy_mortality_carbonflux_si     => this%hvars(ih_canopy_mortality_carbonflux_si)%r81d, &
          hio_ustory_mortality_carbonflux_si => this%hvars(ih_understory_mortality_carbonflux_si)%r81d, &
-         hio_woodproduct_si                 => this%hvars(ih_woodproduct_si)%r81d, &
          hio_gdd_si                           => this%hvars(ih_gdd_si)%r81d, &
          hio_site_ncolddays_si                => this%hvars(ih_site_ncolddays_si)%r81d, &
          hio_site_nchilldays_si               => this%hvars(ih_site_nchilldays_si)%r81d, &
@@ -2544,10 +2542,6 @@ subroutine update_history_dyn_sitelevel(this,nc,nsites,sites)
          hio_cleafoff_si(io_si) = real(sites(s)%phen_model_date - sites(s)%cleafoffdate,r8)
          hio_cleafon_si(io_si)  = real(sites(s)%phen_model_date - sites(s)%cleafondate,r8)
 
-         ! track total wood product accumulation at the site level
-         hio_woodproduct_si(io_si) = sites(s)%resources_management%trunk_product_site &
-              * AREA_INV
-
          ! site-level fire variables:
 
          ! Nesterov index (unitless)
@@ -6347,12 +6341,6 @@ subroutine define_history_vars(this, initialize_variables)
             upfreq=group_dyna_simple, ivar=ivar, initialize=initialize_variables,                 &
             index=ih_elai_si)
 
-       call this%set_history_var(vname='FATES_WOOD_PRODUCT', units='kg m-2',      &
-            long='total wood product from logging in kg carbon per m2 land area', &
-            use_default='active', avgflag='A', vtype=site_r8, hlms='CLM:ALM',   &
-            upfreq=group_dyna_simple, ivar=ivar, initialize=initialize_variables,                 &
-            index=ih_woodproduct_si)
-
        ! Fire Variables
 
        call this%set_history_var(vname='FATES_NESTEROV_INDEX', units='',          &

main/FatesRestartInterfaceMod.F90

@@ -110,7 +110,6 @@ module FatesRestartInterfaceMod
   integer :: ir_landuse_vector_gt_min_si
   integer :: ir_area_bareground_si
   integer :: ir_snow_depth_si
-  integer :: ir_trunk_product_si
   integer :: ir_landuse_config_si
   integer :: ir_ncohort_pa
   integer :: ir_canopy_layer_co
@@ -739,11 +738,6 @@ subroutine define_restart_vars(this, initialize_variables)
          long_name='average snow depth', units='m', flushval = flushzero, &
          hlms='CLM:ALM', initialize=initialize_variables, ivar=ivar, index = ir_snow_depth_si )
 
-    call this%set_restart_var(vname='fates_trunk_product_site', vtype=site_r8, &
-         long_name='Accumulate trunk product flux at site', &
-         units='kgC/m2', flushval = flushzero, &
-         hlms='CLM:ALM', initialize=initialize_variables, ivar=ivar, index = ir_trunk_product_si )
-
     call this%set_restart_var(vname='fates_landuse_config_site', vtype=site_int, &
          long_name='hlm_use_potentialveg status of run that created this restart file', &
          units='kgC/m2', flushval = flushzero, &
@@ -2118,7 +2112,6 @@ subroutine set_restart_vectors(this,nc,nsites,sites)
            rio_landuse_vector_gt_min_si  => this%rvars(ir_landuse_vector_gt_min_si)%int1d, &
            rio_area_bareground_si      => this%rvars(ir_area_bareground_si)%r81d, &
            rio_snow_depth_si           => this%rvars(ir_snow_depth_si)%r81d, &
-           rio_trunk_product_si        => this%rvars(ir_trunk_product_si)%r81d, &
            rio_landuse_config_s        => this%rvars(ir_landuse_config_si)%int1d, &
            rio_ncohort_pa              => this%rvars(ir_ncohort_pa)%int1d, &
            rio_fcansno_pa              => this%rvars(ir_fcansno_pa)%r81d, &
@@ -2743,9 +2736,6 @@ subroutine set_restart_vectors(this,nc,nsites,sites)
           rio_fireweather_index_si(io_idx_si) = sites(s)%fireWeather%fire_weather_index
           rio_snow_depth_si(io_idx_si)   = sites(s)%snow_depth
 
-          ! Accumulated trunk product
-          rio_trunk_product_si(io_idx_si) = sites(s)%resources_management%trunk_product_site
-
           ! land use flag
           rio_landuse_config_si(io_idx_si) = hlm_use_potentialveg
 
@@ -3116,7 +3106,6 @@ subroutine get_restart_vectors(this, nc, nsites, sites)
           rio_landuse_vector_gt_min_si               => this%rvars(ir_landuse_vector_gt_min_si)%int1d, &
           rio_area_bareground_si                  => this%rvars(ir_area_bareground_si)%r81d, &
           rio_snow_depth_si           => this%rvars(ir_snow_depth_si)%r81d, &
-          rio_trunk_product_si        => this%rvars(ir_trunk_product_si)%r81d, &
           rio_landuse_config_si       => this%rvars(ir_landuse_config_si)%int1d, &
           rio_ncohort_pa              => this%rvars(ir_ncohort_pa)%int1d, &
           rio_fcansno_pa              => this%rvars(ir_fcansno_pa)%r81d, &
@@ -3775,7 +3764,6 @@ subroutine get_restart_vectors(this, nc, nsites, sites)
 
           sites(s)%fireWeather%fire_weather_index  = rio_fireweather_index_si(io_idx_si)
           sites(s)%snow_depth     = rio_snow_depth_si(io_idx_si)
-          sites(s)%resources_management%trunk_product_site = rio_trunk_product_si(io_idx_si)
 
           ! if needed, trigger the special procedure to initialize land use structure from a
           ! restart run that did not include land use.