compile-time bugfixes

biogeochem/EDPhysiologyMod.F90

@@ -2785,7 +2785,9 @@ subroutine CWDInput( currentSite, currentPatch, litt, bc_in)
     ! and turnover in dying trees.
     !
     ! !USES:
-
+    use EDParamsMod           , only : landuse_grazing_carbon_use_eff
+    use EDParamsMod           , only : landuse_grazing_nitrogen_use_eff
+    use EDParamsMod           , only : landuse_grazing_phosphorus_use_eff
     !
     ! !ARGUMENTS
     type(ed_site_type), intent(inout), target :: currentSite
@@ -2832,6 +2834,8 @@ subroutine CWDInput( currentSite, currentPatch, litt, bc_in)
     integer  :: numlevsoil        ! Actual number of soil layers
 
     real(r8) :: SF_val_CWD_frac_adj(4) !SF_val_CWD_frac adjusted based on cohort dbh
+    real(r8) :: leaf_herbivory
+    real(r8) :: herbivory_element_use_efficiency
     !----------------------------------------------------------------------
 
     ! -----------------------------------------------------------------------------------
@@ -2842,13 +2846,13 @@ subroutine CWDInput( currentSite, currentPatch, litt, bc_in)
 
     element_id = litt%element_id
 
-    select case(element):
-       case(carbon12_element):
-          herbivory_element_use_efficiency = fates_landuse_grazing_carbon_use_eff
-       case(nitrogen_element):
-          herbivory_element_use_efficiency = fates_landuse_grazing_nitrogen_use_eff
-       case (phosphorus_element):
-          herbivory_element_use_efficiency = fates_landuse_grazing_phosphorus_use_eff
+    select case(element_id)
+       case (carbon12_element)
+          herbivory_element_use_efficiency = landuse_grazing_carbon_use_eff
+       case (nitrogen_element)
+          herbivory_element_use_efficiency = landuse_grazing_nitrogen_use_eff
+       case (phosphorus_element)
+          herbivory_element_use_efficiency = landuse_grazing_phosphorus_use_eff
     end select
 
     ! Object tracking flux diagnostics for each element

biogeochem/FatesLandUseChangeMod.F90

@@ -432,22 +432,32 @@ subroutine fates_grazing(prt, ft, land_use_label, height)
     use PRTGenericMod,    only : leaf_organ
     use PRTGenericMod,    only : prt_vartypes
     use PRTLossFluxesMod, only : PRTHerbivoryLosses
+    use EDParamsMod     , only : landuse_grazing_rate
+    use EDParamsMod     , only : landuse_grazing_maxheight
+    use EDPftvarcon     , only : EDPftvarcon_inst
+    use PRTParametersMod, only : prt_params
+    use FatesAllometryMod,only : CrownDepth
 
     ! apply grazing and browsing to plants as a function of PFT, height (for woody plants), and land use label.
 
     class(prt_vartypes), intent(inout), pointer :: prt
     integer, intent(in)  :: ft
-    integer, intent(in)  :: land_use-label
+    integer, intent(in)  :: land_use_label
     real(r8), intent(in) :: height
 
     real(r8) :: grazing_rate    ! rate of grazing (or browsing) of leaf tissue [day -1]
-
-    grazing_rate = fates_landuse_grazing_rate(land_use_label) * fates_landuse_grazing_palatability(ft)
-
+    real(r8) :: crown_depth
+
+    grazing_rate = landuse_grazing_rate(land_use_label) * EDPftvarcon_inst%landuse_grazing_palatability(ft)
+
     if ( grazing_rate .gt. 0._r8) then
-       if (woody(ft)) then
+       if (prt_params%woody(ft)) then
+
+          call CrownDepth(height,ft,crown_depth)
+
           grazing_rate = grazing_rate * &
-               max(0._r8, min(1._r8, (fates_landuse_grazing_maxheight - height*fates_allom_crown_depth_frac(ft)/(height - height*fates_allom_crown_depth_frac(ft)))))
+               max(0._r8, min(1._r8, &
+               (landuse_grazing_maxheight - (height - crown_depth )) / crown_depth))
        endif
 
        call PRTHerbivoryLosses(prt, leaf_organ, grazing_rate)

main/EDMainMod.F90

@@ -104,6 +104,7 @@ module EDMainMod
   use PRTLossFluxesMod,       only : PRTReproRelease
   use EDPftvarcon,            only : EDPftvarcon_inst
   use FatesHistoryInterfaceMod, only : fates_hist
+  use FatesLandUseChangeMod,  only: fates_grazing
 
   ! CIME Globals
   use shr_log_mod         , only : errMsg => shr_log_errMsg
@@ -955,7 +956,7 @@ subroutine TotalBalanceCheck (currentSite, call_index )
           write(fates_log(),*) 'flux_generic_out: ',site_mass%flux_generic_out
           write(fates_log(),*) 'frag_out: ',site_mass%frag_out
           write(fates_log(),*) 'aresp_acc: ',site_mass%aresp_acc
-          write(fates_log(),*) 'herbivory_flux: ',site_mass%herbivory_flux
+          write(fates_log(),*) 'herbivory_flux_out: ',site_mass%herbivory_flux_out
           write(fates_log(),*) 'error=net_flux-dstock:', error
           write(fates_log(),*) 'biomass', biomass_stock
           write(fates_log(),*) 'litter',litter_stock

main/EDParamsMod.F90

@@ -602,7 +602,7 @@ subroutine FatesRegisterParams(fates_params)
     call fates_params%RegisterParameter(name=name_landuse_grazing_nitrogen_use_eff, dimension_shape=dimension_shape_scalar, &
          dimension_names=dim_names_scalar)
 
-    call fates_params%RegisterParameter(name=name_landuse_grazing_phosporus_use_eff, dimension_shape=dimension_shape_scalar, &
+    call fates_params%RegisterParameter(name=name_landuse_grazing_phosphorus_use_eff, dimension_shape=dimension_shape_scalar, &
          dimension_names=dim_names_scalar)
 
     ! non-scalar parameters

parteh/PRTLossFluxesMod.F90

@@ -918,7 +918,7 @@ subroutine PRTHerbivoryLosses(prt, organ_id, mass_fraction)
           do i_pos = 1,prt_global%state_descriptor(i_var)%num_pos
 
              ! The mass that is leaving the plant
-             consumed_mass = mass_fraction * prt%variables(i_var)%val(i_pos)
+             herbivore_consumed_mass = mass_fraction * prt%variables(i_var)%val(i_pos)
 
              ! Track the amount of mass being eaten (+ is amount lost)
              prt%variables(i_var)%herbivory(i_pos) = prt%variables(i_var)%herbivory(i_pos) &