Merge branch 'glemieux/lnd/fatesluc_cbasedhrv_v2' (PR #5429)

This pull request contains modification in E3SM corresponding to another FATES
NGEET/fates#888. In detail, the necessary input to enable
FATES C-based harvest from ELM is passed to FATES through bc_in. Output
from FATES used to calculate land use emission and net biosphere productivity
is passed to ELM through bc_out.

[non-B4B] (FATES tests only)

cime_config/machines/config_machines.xml

@@ -3597,10 +3597,10 @@
       <cmd_path lang="python">/usr/Modules/bin/modulecmd python</cmd_path>
       <modules>
         <command name="purge"/>
-	<command name="load">cmake/3.15.0</command>
+	     <command name="load">cmake/3.15.0</command>
         <command name="load">perl</command>
-	<command name="load">xml-libxml/2.0116</command>
-	<command name="load">python/3.6</command>
+	     <command name="load">xml-libxml/2.0116</command>
+	     <command name="load">python/3.6</command>
       </modules>
       <modules compiler="intel">
         <command name="load">intel/2016.4.072</command>
@@ -3675,10 +3675,10 @@
       <cmd_path lang="perl">/usr/Modules/bin/modulecmd perl</cmd_path>
       <cmd_path lang="python">/usr/Modules/bin/modulecmd python</cmd_path>
       <modules>
-	<command name="purge"/>
+	     <command name="purge"/>
         <command name="load">cmake/3.15.0</command>
         <command name="load">perl</command>
-	<command name="load">xml-libxml/2.0116</command>
+	     <command name="load">xml-libxml/2.0116</command>
         <command name="load">python/3.6</command>
       </modules>
       <modules compiler="intel">

components/elm/bld/namelist_files/namelist_defaults.xml

@@ -125,7 +125,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 <!-- ================================================================== -->
 <!-- FATES default parameter file                                       -->
 <!-- ================================================================== -->
-<fates_paramfile >lnd/clm2/paramdata/fates_params_api.24.0.0_12pft_c220719.nc</fates_paramfile>
+<fates_paramfile >lnd/clm2/paramdata/fates_params_api.25.0.0_12pft_c221212.nc</fates_paramfile>
 
 <!-- soil order related parameters (relative to {csmdata}) -->
 <fsoilordercon             >lnd/clm2/paramdata/CNP_parameters_c131108.nc</fsoilordercon>

components/elm/cime_config/testdefs/testmods_dirs/elm/fates/user_nl_elm

@@ -16,7 +16,7 @@ hist_fincl1       = 'FATES_NCOHORTS', 'FATES_TRIMMING', 'FATES_AREA_PLANTS',
 'FATES_FUEL_AMOUNT', 'FATES_LITTER_IN', 'FATES_LITTER_OUT',
 'FATES_SEED_BANK', 'FATES_SEEDS_IN', 'FATES_STOREC', 'FATES_VEGC',
 'FATES_SAPWOODC', 'FATES_LEAFC', 'FATES_FROOTC', 'FATES_REPROC',
-'FATES_CEFFLUX', 'FATES_STRUCTC', 'FATES_NONSTRUCTC', 'FATES_VEGC_ABOVEGROUND',
+'FATES_STRUCTC', 'FATES_NONSTRUCTC', 'FATES_VEGC_ABOVEGROUND',
 'FATES_CANOPY_VEGC', 'FATES_USTORY_VEGC', 'FATES_PRIMARY_PATCHFUSION_ERR',
 'FATES_DISTURBANCE_RATE_P2P', 'FATES_DISTURBANCE_RATE_P2S',
 'FATES_DISTURBANCE_RATE_S2S', 'FATES_DISTURBANCE_RATE_FIRE',

components/elm/cime_config/testdefs/testmods_dirs/elm/fates_eca/user_nl_elm

@@ -18,7 +18,7 @@ hist_fincl1       = 'FATES_NCOHORTS', 'FATES_TRIMMING', 'FATES_AREA_PLANTS',
 'FATES_FUEL_AMOUNT', 'FATES_LITTER_IN', 'FATES_LITTER_OUT',
 'FATES_SEED_BANK', 'FATES_SEEDS_IN', 'FATES_STOREC', 'FATES_VEGC',
 'FATES_SAPWOODC', 'FATES_LEAFC', 'FATES_FROOTC', 'FATES_REPROC',
-'FATES_CEFFLUX', 'FATES_STRUCTC', 'FATES_NONSTRUCTC', 'FATES_VEGC_ABOVEGROUND',
+'FATES_STRUCTC', 'FATES_NONSTRUCTC', 'FATES_VEGC_ABOVEGROUND',
 'FATES_CANOPY_VEGC', 'FATES_USTORY_VEGC', 'FATES_PRIMARY_PATCHFUSION_ERR',
 'FATES_DISTURBANCE_RATE_P2P', 'FATES_DISTURBANCE_RATE_P2S',
 'FATES_DISTURBANCE_RATE_S2S', 'FATES_DISTURBANCE_RATE_FIRE',
@@ -33,7 +33,16 @@ hist_fincl1       = 'FATES_NCOHORTS', 'FATES_TRIMMING', 'FATES_AREA_PLANTS',
 'FATES_CBALANCE_ERROR', 'FATES_ERROR_EL', 'FATES_LEAF_ALLOC',
 'FATES_SEED_ALLOC', 'FATES_STEM_ALLOC', 'FATES_FROOT_ALLOC',
 'FATES_CROOT_ALLOC', 'FATES_STORE_ALLOC','FATES_LITTER_IN_EL','FATES_LITTER_OUT_EL',
-'FATES_LEAFN','FATES_LEAFP','FATES_FROOTN','FATES_FROOTP','FATES_NH4UPTAKE',
-'FATES_NO3UPTAKE','FATES_NEFFLUX','FATES_PUPTAKE','FATES_PEFFLUX',
 'NET_NMIN','NET_PMIN','LITR1P_vr','LITR1C_vr','LITR1N_vr','SOLUTIONP',
-'SMIN_NO3','SMIN_NH4','TOTSOMN','TOTSOMP'
+'SMIN_NO3','SMIN_NH4','TOTSOMN','TOTSOMP',
+'FATES_L2FR','FATES_L2FR_CANOPY_REC_PF','FATES_L2FR_USTORY_REC_PF',
+'FATES_NH4UPTAKE_SZPF','FATES_NO3UPTAKE_SZPF','FATES_NEFFLUX_SZPF'	,
+'FATES_NDEMAND_SZPF','FATES_NFIX_SYM_SZPF','FATES_NH4UPTAKE','FATES_NO3UPTAKE',
+'FATES_NEFFLUX','FATES_NDEMAND','FATES_NFIX_SYM','FATES_STOREN','FATES_STOREN_TF',
+'FATES_VEGN','FATES_SAPWOODN','FATES_LEAFN','FATES_FROOTN','FATES_REPRON','FATES_VEGN_SZPF',
+'FATES_LEAFN_SZPF','FATES_FROOTN_SZPF','FATES_SAPWOODN_SZPF','FATES_STOREN_SZPF','FATES_STOREN_TF_CANOPY_SZPF',
+'FATES_STOREN_TF_USTORY_SZPF','FATES_REPRON_SZPF','FATES_STOREP','FATES_STOREP_TF','FATES_VEGP','FATES_SAPWOODP',
+'FATES_LEAFP','FATES_FROOTP','FATES_REPROP','FATES_PUPTAKE','FATES_PEFFLUX','FATES_PDEMAND',
+'FATES_VEGP_SZPF','FATES_LEAFP_SZPF','FATES_FROOTP_SZPF','FATES_SAPWOODP_SZPF','FATES_STOREP_SZPF',
+'FATES_STOREP_TF_CANOPY_SZPF','FATES_STOREP_TF_USTORY_SZPF','FATES_REPROP_SZPF','FATES_PUPTAKE_SZPF',
+'FATES_PEFFLUX_SZPF','FATES_PDEMAND_SZPF'

components/elm/cime_config/testdefs/testmods_dirs/elm/fates_rd/user_nl_elm

@@ -18,7 +18,7 @@ hist_fincl1       = 'FATES_NCOHORTS', 'FATES_TRIMMING', 'FATES_AREA_PLANTS',
 'FATES_FUEL_AMOUNT', 'FATES_LITTER_IN', 'FATES_LITTER_OUT',
 'FATES_SEED_BANK', 'FATES_SEEDS_IN', 'FATES_STOREC', 'FATES_VEGC',
 'FATES_SAPWOODC', 'FATES_LEAFC', 'FATES_FROOTC', 'FATES_REPROC',
-'FATES_CEFFLUX', 'FATES_STRUCTC', 'FATES_NONSTRUCTC', 'FATES_VEGC_ABOVEGROUND',
+'FATES_STRUCTC', 'FATES_NONSTRUCTC', 'FATES_VEGC_ABOVEGROUND',
 'FATES_CANOPY_VEGC', 'FATES_USTORY_VEGC', 'FATES_PRIMARY_PATCHFUSION_ERR',
 'FATES_DISTURBANCE_RATE_P2P', 'FATES_DISTURBANCE_RATE_P2S',
 'FATES_DISTURBANCE_RATE_S2S', 'FATES_DISTURBANCE_RATE_FIRE',
@@ -33,7 +33,16 @@ hist_fincl1       = 'FATES_NCOHORTS', 'FATES_TRIMMING', 'FATES_AREA_PLANTS',
 'FATES_CBALANCE_ERROR', 'FATES_ERROR_EL', 'FATES_LEAF_ALLOC',
 'FATES_SEED_ALLOC', 'FATES_STEM_ALLOC', 'FATES_FROOT_ALLOC',
 'FATES_CROOT_ALLOC', 'FATES_STORE_ALLOC','FATES_LITTER_IN_EL','FATES_LITTER_OUT_EL',
-'FATES_LEAFN','FATES_LEAFP','FATES_FROOTN','FATES_FROOTP','FATES_NH4UPTAKE',
-'FATES_NO3UPTAKE','FATES_NEFFLUX','FATES_PUPTAKE','FATES_PEFFLUX',
 'NET_NMIN','NET_PMIN','LITR1P_vr','LITR1C_vr','LITR1N_vr','SOLUTIONP',
-'SMIN_NO3','SMIN_NH4','TOTSOMN','TOTSOMP'
+'SMIN_NO3','SMIN_NH4','TOTSOMN','TOTSOMP',
+'FATES_L2FR','FATES_L2FR_CANOPY_REC_PF','FATES_L2FR_USTORY_REC_PF',
+'FATES_NH4UPTAKE_SZPF','FATES_NO3UPTAKE_SZPF','FATES_NEFFLUX_SZPF'	,
+'FATES_NDEMAND_SZPF','FATES_NFIX_SYM_SZPF','FATES_NH4UPTAKE','FATES_NO3UPTAKE',
+'FATES_NEFFLUX','FATES_NDEMAND','FATES_NFIX_SYM','FATES_STOREN','FATES_STOREN_TF',
+'FATES_VEGN','FATES_SAPWOODN','FATES_LEAFN','FATES_FROOTN','FATES_REPRON','FATES_VEGN_SZPF',
+'FATES_LEAFN_SZPF','FATES_FROOTN_SZPF','FATES_SAPWOODN_SZPF','FATES_STOREN_SZPF','FATES_STOREN_TF_CANOPY_SZPF',
+'FATES_STOREN_TF_USTORY_SZPF','FATES_REPRON_SZPF','FATES_STOREP','FATES_STOREP_TF','FATES_VEGP','FATES_SAPWOODP',
+'FATES_LEAFP','FATES_FROOTP','FATES_REPROP','FATES_PUPTAKE','FATES_PEFFLUX','FATES_PDEMAND',
+'FATES_VEGP_SZPF','FATES_LEAFP_SZPF','FATES_FROOTP_SZPF','FATES_SAPWOODP_SZPF','FATES_STOREP_SZPF',
+'FATES_STOREP_TF_CANOPY_SZPF','FATES_STOREP_TF_USTORY_SZPF','FATES_REPROP_SZPF','FATES_PUPTAKE_SZPF',
+'FATES_PEFFLUX_SZPF','FATES_PDEMAND_SZPF'

components/elm/src/biogeochem/AllocationMod.F90

@@ -908,7 +908,7 @@ subroutine Allocation2_ResolveNPLimit (bounds, num_soilc, filter_soilc  , &
    real(r8) :: excess_immob_no3_vr(1:nlevdecomp) ! no3 excess flux, if soil microbes are more P limited
    real(r8) :: excess_immob_p_vr(1:nlevdecomp)   ! P excess flux, if soil microbes are more N limited
    real(r8) :: decompmicc(1:nlevdecomp)          ! column-level soil microbial decomposer biomass gC/m3
-
+   real(r8) :: ndemand, pdemand                  ! Column level N and P demand used for downscaling plant level uptake for FATES
    real(r8) :: fpi_no3_vr(1:nlevdecomp) ! fraction of potential immobilization supplied by no3(no units)
    real(r8) :: fpi_nh4_vr(1:nlevdecomp) ! fraction of potential immobilization supplied by nh4 (no units)
 
@@ -918,8 +918,7 @@ subroutine Allocation2_ResolveNPLimit (bounds, num_soilc, filter_soilc  , &
    integer :: fc        ! lake filter column index
    integer :: f         ! loop index for plant competitors
    integer :: ci, s     ! used for FATES BC (clump index, site index)
-   integer :: j_f       ! local index that maps a decomposition
-                        ! layer onto a fates uptake layer
+   integer :: ft        ! FATES PFT index
 
    ! Fractional uptake profiles, that are proportional to root density
    real(r8):: nuptake_prof(bounds%begc:bounds%endc,1:nlevdecomp)
@@ -933,10 +932,8 @@ subroutine Allocation2_ResolveNPLimit (bounds, num_soilc, filter_soilc  , &
    integer  :: pci, pcf                        ! (I)nitial and (F)inal plant competitor index
    real(r8), pointer :: veg_rootc_ptr(:,:)     ! points to either native ELM or FATES root carbon array
    integer, pointer  :: ft_index_ptr(:)        ! points to either native ELM or FATES PFT array
-   real(r8), pointer :: cn_scalar_ptr(:)       ! points to either native ELM or FATES C:N scalar array
-   real(r8), pointer :: cn_scalar_runmean_ptr(:)       ! points to either native ELM or FATES C:N scalar array
-   real(r8), pointer :: cp_scalar_ptr(:)       ! points to either native ELM or FATES C:P scalar array
-   real(r8), pointer :: cp_scalar_runmean_ptr(:)       ! points to either native ELM or FATES C:P scalar array
+   real(r8), pointer :: cn_scalar_runmean_ptr(:)
+   real(r8), pointer :: cp_scalar_runmean_ptr(:)
    real(r8), pointer :: plant_nh4demand_vr_ptr(:,:)
    real(r8), pointer :: plant_no3demand_vr_ptr(:,:)
    real(r8), pointer :: plant_pdemand_vr_ptr(:,:)
@@ -1112,13 +1109,34 @@ subroutine Allocation2_ResolveNPLimit (bounds, num_soilc, filter_soilc  , &
               ! Overwrite the column level demands, since fates plants are all sharing
               ! the same space, in units per the same square meter, we just add demand
               ! to scale up to column
-              plant_ndemand_col(c) = sum(elm_fates%fates(ci)%bc_out(s)%n_demand(1:n_pcomp))
-              plant_pdemand_col(c) = sum(elm_fates%fates(ci)%bc_out(s)%p_demand(1:n_pcomp))
-
+              plant_ndemand_col(c) = 0._r8
+              plant_pdemand_col(c) = 0._r8
+              
               ! We fill the vertically resolved array to simplify some jointly used code
               do j = 1, nlevdecomp
-                 col_plant_ndemand_vr(c,j) = plant_ndemand_col(c) * nuptake_prof(c,j)
-                 col_plant_pdemand_vr(c,j) = plant_pdemand_col(c) * puptake_prof(c,j)
+
+                 col_plant_ndemand_vr(c,j) = 0._r8
+                 col_plant_pdemand_vr(c,j) = 0._r8
+
+                 do f = 1,n_pcomp
+                    ft = elm_fates%fates(ci)%bc_out(s)%ft_index(f)
+
+                    ! [gN/m3/s] = [gC/m3] * [gN/gC/s]
+                    col_plant_ndemand_vr(c,j) = col_plant_ndemand_vr(c,j) + &
+                         elm_fates%fates(ci)%bc_out(s)%veg_rootc(f,j) * &
+                         (elm_fates%fates(ci)%bc_pconst%vmax_nh4(ft) + &
+                          elm_fates%fates(ci)%bc_pconst%vmax_no3(ft))
+
+                    col_plant_pdemand_vr(c,j) = col_plant_pdemand_vr(c,j) + &
+                         elm_fates%fates(ci)%bc_out(s)%veg_rootc(f,j) * &
+                         elm_fates%fates(ci)%bc_pconst%vmax_p(ft)
+
+                 end do
+
+                 ! [gN/m2/s]
+                 plant_ndemand_col(c) = plant_ndemand_col(c) + col_plant_ndemand_vr(c,j)*dzsoi_decomp(j)
+                 plant_pdemand_col(c) = plant_pdemand_col(c) + col_plant_pdemand_vr(c,j)*dzsoi_decomp(j)
+
               end do
 
            else  !(ECA)
@@ -1131,19 +1149,17 @@ subroutine Allocation2_ResolveNPLimit (bounds, num_soilc, filter_soilc  , &
               ft_index_ptr   => elm_fates%fates(ci)%bc_out(s)%ft_index      ! Should be 
               decompmicc(:)  =  elm_fates%fates(ci)%bc_out(s)%decompmicc(:) ! Should be (nlevdecomp)
 
-              cn_scalar_ptr          => elm_fates%fates(ci)%bc_out(s)%cn_scalar          ! (i,j)
-              cn_scalar_runmean_ptr  => elm_fates%fates(ci)%bc_out(s)%cn_scalar          ! (i,j)
+              cn_scalar_runmean_ptr  => elm_fates%fates(ci)%bc_out(s)%cn_scalar  ! This is 1.0
               plant_nh4demand_vr_ptr => plant_nh4demand_vr_fates
               km_nh4_ptr             => elm_fates%fates(ci)%bc_pconst%eca_km_nh4
-              vmax_nh4_ptr           => elm_fates%fates(ci)%bc_pconst%eca_vmax_nh4
+              vmax_nh4_ptr           => elm_fates%fates(ci)%bc_pconst%vmax_nh4
               plant_no3demand_vr_ptr => plant_no3demand_vr_fates
               km_no3_ptr             => elm_fates%fates(ci)%bc_pconst%eca_km_no3
-              vmax_no3_ptr           => elm_fates%fates(ci)%bc_pconst%eca_vmax_no3
-              cp_scalar_ptr          => elm_fates%fates(ci)%bc_out(s)%cp_scalar
-              cp_scalar_runmean_ptr  => elm_fates%fates(ci)%bc_out(s)%cp_scalar
+              vmax_no3_ptr           => elm_fates%fates(ci)%bc_pconst%vmax_no3
+              cp_scalar_runmean_ptr  => elm_fates%fates(ci)%bc_out(s)%cp_scalar  ! This is 1.0
               plant_pdemand_vr_ptr   => plant_pdemand_vr_fates
               km_p_ptr               => elm_fates%fates(ci)%bc_pconst%eca_km_p
-              vmax_p_ptr             => elm_fates%fates(ci)%bc_pconst%eca_vmax_p
+              vmax_p_ptr             => elm_fates%fates(ci)%bc_pconst%vmax_p
 
            end if
 
@@ -1201,7 +1217,6 @@ subroutine Allocation2_ResolveNPLimit (bounds, num_soilc, filter_soilc  , &
 
               km_nh4_ptr    => km_plant_nh4
               vmax_nh4_ptr  => vmax_plant_nh4
-              cn_scalar_ptr => cn_scalar
               cn_scalar_runmean_ptr => cn_scalar_runmean
               km_no3_ptr   => km_plant_no3
               vmax_no3_ptr => vmax_plant_no3
@@ -1700,32 +1715,52 @@ subroutine Allocation2_ResolveNPLimit (bounds, num_soilc, filter_soilc  , &
 
               if( plant_ndemand_col(c)>tiny(plant_ndemand_col(c)) ) then
                  do f = 1,n_pcomp
-                    do j = 1,nlevdecomp
 
-                       j_f =  elm_fates%fates(ci)%bc_pconst%j_uptake(j)
+                    ft = elm_fates%fates(ci)%bc_out(s)%ft_index(f)
 
-                       elm_fates%fates(ci)%bc_in(s)%plant_nh4_uptake_flux(f,j_f) = & 
-                            elm_fates%fates(ci)%bc_in(s)%plant_nh4_uptake_flux(f,j_f) + &
+                    ! [gN/m2/s]
+                    ndemand=0._r8
+                    do j = 1,nlevdecomp
+                       ndemand = ndemand + elm_fates%fates(ci)%bc_out(s)%veg_rootc(f,j) * &
+                            (elm_fates%fates(ci)%bc_pconst%vmax_nh4(ft)+elm_fates%fates(ci)%bc_pconst%vmax_no3(ft)) * &
+                            dzsoi_decomp(j)
+                    end do
+
+                    do j = 1,nlevdecomp
+
+                       elm_fates%fates(ci)%bc_in(s)%plant_nh4_uptake_flux(f,1) = & 
+                            elm_fates%fates(ci)%bc_in(s)%plant_nh4_uptake_flux(f,1) + &
                             smin_nh4_to_plant_vr(c,j)*dt*dzsoi_decomp(j) * &
-                            (elm_fates%fates(ci)%bc_out(s)%n_demand(f)/plant_ndemand_col(c))
+                            (ndemand/plant_ndemand_col(c))
 
-                       elm_fates%fates(ci)%bc_in(s)%plant_no3_uptake_flux(f,j_f) = & 
-                            elm_fates%fates(ci)%bc_in(s)%plant_no3_uptake_flux(f,j_f) + &
+                       elm_fates%fates(ci)%bc_in(s)%plant_no3_uptake_flux(f,1) = & 
+                            elm_fates%fates(ci)%bc_in(s)%plant_no3_uptake_flux(f,1) + &
                             smin_no3_to_plant_vr(c,j)*dt*dzsoi_decomp(j) * &
-                            (elm_fates%fates(ci)%bc_out(s)%n_demand(f)/plant_ndemand_col(c))
+                            (ndemand/plant_ndemand_col(c))
 
                     end do
                  end do
               end if
 
             if( plant_pdemand_col(c)>tiny(plant_pdemand_col(c)) ) then
                do f = 1,n_pcomp
+
+                  ft = elm_fates%fates(ci)%bc_out(s)%ft_index(f)
+
+                  pdemand=0._r8
                   do j = 1,nlevdecomp
-                     j_f =  elm_fates%fates(ci)%bc_pconst%j_uptake(j)
-                     elm_fates%fates(ci)%bc_in(s)%plant_p_uptake_flux(f,j_f) = & 
-                          elm_fates%fates(ci)%bc_in(s)%plant_p_uptake_flux(f,j_f) + &
+                     ! [gP/m2/s]
+                     pdemand = pdemand+elm_fates%fates(ci)%bc_out(s)%veg_rootc(f,j) * &
+                          elm_fates%fates(ci)%bc_pconst%vmax_p(ft) * &
+                          dzsoi_decomp(j)
+                  end do
+
+                  do j = 1,nlevdecomp
+                     ! [gP/m2/step]
+                     elm_fates%fates(ci)%bc_in(s)%plant_p_uptake_flux(f,1) = & 
+                          elm_fates%fates(ci)%bc_in(s)%plant_p_uptake_flux(f,1) + &
                           sminp_to_plant_vr(c,j)*dt*dzsoi_decomp(j) * &
-                          (elm_fates%fates(ci)%bc_out(s)%p_demand(f)/plant_pdemand_col(c))
+                          (pdemand/plant_pdemand_col(c))
 
                   end do
                end do
@@ -1735,18 +1770,17 @@ subroutine Allocation2_ResolveNPLimit (bounds, num_soilc, filter_soilc  , &
 
             do f = 1,n_pcomp
                do j = 1,nlevdecomp
-                  j_f =  elm_fates%fates(ci)%bc_pconst%j_uptake(j)
 
-                  elm_fates%fates(ci)%bc_in(s)%plant_nh4_uptake_flux(f,j_f) = & 
-                       elm_fates%fates(ci)%bc_in(s)%plant_nh4_uptake_flux(f,j_f) + & 
+                  elm_fates%fates(ci)%bc_in(s)%plant_nh4_uptake_flux(f,1) = & 
+                       elm_fates%fates(ci)%bc_in(s)%plant_nh4_uptake_flux(f,1) + & 
                        plant_nh4demand_vr_fates(f,j) * fpg_nh4_vr(c,j)  * dzsoi_decomp(j) * dt
 
-                  elm_fates%fates(ci)%bc_in(s)%plant_no3_uptake_flux(f,j_f) = & 
-                       elm_fates%fates(ci)%bc_in(s)%plant_no3_uptake_flux(f,j_f) + & 
+                  elm_fates%fates(ci)%bc_in(s)%plant_no3_uptake_flux(f,1) = & 
+                       elm_fates%fates(ci)%bc_in(s)%plant_no3_uptake_flux(f,1) + & 
                        plant_no3demand_vr_fates(f,j) * fpg_no3_vr(c,j) * dzsoi_decomp(j) * dt
 
-                  elm_fates%fates(ci)%bc_in(s)%plant_p_uptake_flux(f,j_f) = & 
-                       elm_fates%fates(ci)%bc_in(s)%plant_p_uptake_flux(f,j_f) + & 
+                  elm_fates%fates(ci)%bc_in(s)%plant_p_uptake_flux(f,1) = & 
+                       elm_fates%fates(ci)%bc_in(s)%plant_p_uptake_flux(f,1) + & 
                        (plant_pdemand_vr_fates(f,j) * fpg_p_vr(c,j)) * dzsoi_decomp(j) * dt
 
                end do
@@ -3315,18 +3349,12 @@ subroutine PAllocationECAMIC(pci, &
        e_km_p = e_km_p + e_decomp_scalar*decompmicc(j)/km_decomp_p + &
             max(0._r8,vmax_minsurf_p_vr(j)-labilep_vr(j))/km_minsurf_p_vr(j)
 
-!       if(carbon_only .or. carbonnitrogen_only) then
-!          do i = 1, n_pcomp
-!             compet_plant(i) = 1._r8
-!          end do
-!       else
-          do i = 1,n_pcomp
-             ip = filter_pcomp(i)
-             ft = ft_index(ip)
-             compet_plant(i) = solution_pconc / & 
-                  (km_plant_p(ft)*(1._r8 + solution_pconc/km_plant_p(ft) + e_km_p))
-          end do
-!       end if
+       do i = 1,n_pcomp
+          ip = filter_pcomp(i)
+          ft = ft_index(ip)
+          compet_plant(i) = solution_pconc / & 
+               (km_plant_p(ft)*(1._r8 + solution_pconc/km_plant_p(ft) + e_km_p))
+       end do
 
        compet_decomp_p = solution_pconc / &
             (km_decomp_p * (1._r8 + solution_pconc/km_decomp_p + e_km_p))

components/elm/src/biogeochem/EcosystemDynMod.F90

@@ -805,6 +805,13 @@ subroutine EcosystemDynNoLeaching2(bounds,                                  &
 
        call t_stop_lnd(event)
 
+   else
+       call alm_fates%wrap_WoodProducts(bounds, num_soilc, filter_soilc)
+
+       call WoodProducts(num_soilc, filter_soilc )
+
+       call CropHarvestPools(num_soilc, filter_soilc, dt)
+
    end if
 
    if ( ero_ccycle ) then