Merge branch 'yangx/lnd/outputs_bugfix_maint-1.1' into maint-1.1 (PR #…

…3288) Correction of last commit that used incorrect variable names This PR fixes problems from a previous PR. Incorrect variable names were used in that PR (those are from the current master but the slight differences between current master and maint 1.1 were not noticed). The are corrected in this PR. [BFB]
E3SM-Project · Nov 5, 2019 · 81f059e · 81f059e
2 parents 2236dba + dfd6faf
commit 81f059e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/components/clm/src/biogeochem/CNNitrogenFluxType.F90 b/components/clm/src/biogeochem/CNNitrogenFluxType.F90
@@ -2933,13 +2933,13 @@ subroutine Summary(this, bounds, num_soilc, filter_soilc, num_soilp, filter_soil
 
       if (crop_prog) then
          this%sen_nloss_litter(p) = &
-             this%livestemn_to_litter(p)            + &
-             this%leafn_to_litter(p)                + &
-             this%frootn_to_litter(p)
+             this%livestemn_to_litter_patch(p)            + &
+             this%leafn_to_litter_patch(p)                + &
+             this%frootn_to_litter_patch(p)
       else
          this%sen_nloss_litter(p) = &
-             this%leafn_to_litter(p)                + &
-             this%frootn_to_litter(p)
+             this%leafn_to_litter_patch(p)                + &
+             this%frootn_to_litter_patch(p)
       end if
 
     end do

diff --git a/components/clm/src/biogeochem/PhosphorusFluxType.F90 b/components/clm/src/biogeochem/PhosphorusFluxType.F90
@@ -2345,13 +2345,13 @@ subroutine Summary(this, bounds, num_soilc, filter_soilc, num_soilp, filter_soil
 
       if (crop_prog) then
          this%sen_ploss_litter(p) = &
-             this%livestemp_to_litter(p)            + &
-             this%leafp_to_litter(p)                + &
-             this%frootp_to_litter(p)
+             this%livestemp_to_litter_patch(p)            + &
+             this%leafp_to_litter_patch(p)                + &
+             this%frootp_to_litter_patch(p)
       else
          this%sen_ploss_litter(p) = &
-             this%leafp_to_litter(p)                + &
-             this%frootp_to_litter(p)
+             this%leafp_to_litter_patch(p)                + &
+             this%frootp_to_litter_patch(p)
       end if
 
     end do