Merge pull request #25 from samsrabin/landuse_fixes-ssr

Minor changes to landuse_fixes branch
glemieux · Nov 1, 2024 · 6f4f3f6 · 6f4f3f6
2 parents 5688237 + 111278a
commit 6f4f3f6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/biogeochem/EDLoggingMortalityMod.F90 b/biogeochem/EDLoggingMortalityMod.F90
@@ -306,7 +306,7 @@ subroutine LoggingMortality_frac( currentSite, bc_in, pft_i, dbh, canopy_layer,
                ! HARVEST_SH2 = harvest from secondary young forest
                ! HARVEST_SH3 = harvest from secondary non-forest (assume this is young for biomass)
 
-               ! if using the direct LUH2 drivers, the variabel names are instead (if using area-based logging):
+               ! if using the direct LUH2 drivers, the variable names are instead (if using area-based logging):
                ! 'primf_harv', 'primn_harv', 'secmf_harv', 'secyf_harv', 'secnf_harv'
 
                secondary_young_fraction = currentSite%get_secondary_young_fraction()
@@ -392,24 +392,19 @@ subroutine LoggingMortality_frac( currentSite, bc_in, pft_i, dbh, canopy_layer,
 
       else
          ! the logic below is mainly to prevent conversion of bare ground land; everything else should be primary at this point.
+         lmort_direct     = 0.0_r8
+         lmort_collateral = 0.0_r8
+         lmort_infra      = 0.0_r8
+         l_degrad         = 0.0_r8
          if ( patch_land_use_label .eq. primaryland ) then
             call GetInitLanduseHarvestRate(bc_in, currentSite%min_allowed_landuse_fraction, &
                  harvest_rate, currentSite%landuse_vector_gt_min)
-            lmort_direct     = 0.0_r8
-            lmort_collateral = 0.0_r8
-            lmort_infra      = 0.0_r8
-            l_degrad         = 0.0_r8
             if(prt_params%woody(pft_i) == itrue)then
                lmort_direct     = harvest_rate
             else if (canopy_layer .eq. 1) then
                l_degrad         = harvest_rate
             endif
-         else if ( patch_land_use_label .eq. nocomp_bareground_land ) then
-            lmort_direct     = 0.0_r8
-            lmort_collateral = 0.0_r8
-            lmort_infra      = 0.0_r8
-            l_degrad         = 0.0_r8
-         else
+         else if ( patch_land_use_label .ne. nocomp_bareground_land ) then
             write(fates_log(),*) 'trying to transition away from something that isnt either primary or bare ground,'
             write(fates_log(),*) 'on what should be a first timestep away from potential vaegetatino. this shouldnt happen.'
             write(fates_log(),*) 'exiting'

diff --git a/main/FatesHistoryInterfaceMod.F90 b/main/FatesHistoryInterfaceMod.F90
@@ -6127,7 +6127,7 @@ 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',      &
+       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,                 &