Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor some max_patch_per_col and maxsoil_patches loops #2056

Merged
merged 9 commits into from
Aug 25, 2023
Merged

Refactor some max_patch_per_col and maxsoil_patches loops #2056

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b24e0aa
Refactor some max_patch_per_col and maxsoil_pa loops
slevis-lmwg Jul 12, 2023
701b504
Refactor more max_patch_per_col and maxsoil_patches loops
slevis-lmwg Jul 13, 2023
1b97830
Merge remote-tracking branch 'escomp/master' into repl_max_patch_per_col
slevis-lmwg Jul 28, 2023
298c705
First draft of ChangeLog/Sum
slevis-lmwg Jul 28, 2023
ecedb08
Merge remote-tracking branch 'escomp/master' into repl_max_patch_per_col
slevis-lmwg Aug 17, 2023
f10c7fe
Adjust white space to reduce diffs from main
slevis-lmwg Aug 22, 2023
aa5be42
Correction for failing cheyenne test to pass
slevis-lmwg Aug 22, 2023
9aeff97
Merge remote-tracking branch 'escomp/master' into repl_max_patch_per_col
slevis-lmwg Aug 24, 2023
01c208d
Update ChangeLog
slevis-lmwg Aug 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
533 changes: 226 additions & 307 deletions src/biogeochem/CNCIsoFluxMod.F90
View file
Open in desktop

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions src/biogeochem/CNDriverMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,7 +681,7 @@ subroutine CNDriverNoLeaching(bounds,

call t_startf('CNGapMortality')

call CNGapMortality (bounds, num_soilc, filter_soilc, num_soilp, filter_soilp, &
call CNGapMortality (bounds, num_soilp, filter_soilp, &
dgvs_inst, cnveg_carbonstate_inst, cnveg_nitrogenstate_inst, soilbiogeochem_nitrogenflux_inst, &
cnveg_carbonflux_inst, cnveg_nitrogenflux_inst, canopystate_inst, &
!cnveg_carbonflux_inst, cnveg_nitrogenflux_inst, &
Expand All @@ -703,14 +703,14 @@ subroutine CNDriverNoLeaching(bounds,

! Set the carbon isotopic fluxes for gap mortality
if ( use_c13 ) then
call CIsoFlux2(num_soilc, filter_soilc, num_soilp, filter_soilp, &
call CIsoFlux2(num_soilp, filter_soilp, &
soilbiogeochem_state_inst, cnveg_carbonflux_inst, cnveg_carbonstate_inst, &
iso_cnveg_carbonflux_inst=c13_cnveg_carbonflux_inst, &
iso_cnveg_carbonstate_inst=c13_cnveg_carbonstate_inst, &
isotope='c13')
end if
if ( use_c14 ) then
call CIsoFlux2(num_soilc, filter_soilc, num_soilp, filter_soilp, &
call CIsoFlux2(num_soilp, filter_soilp, &
soilbiogeochem_state_inst, cnveg_carbonflux_inst, cnveg_carbonstate_inst, &
iso_cnveg_carbonflux_inst=c14_cnveg_carbonflux_inst, &
iso_cnveg_carbonstate_inst=c14_cnveg_carbonstate_inst, &
Expand Down Expand Up @@ -746,20 +746,20 @@ subroutine CNDriverNoLeaching(bounds,

! Set harvest mortality routine
if (get_do_harvest()) then
call CNHarvest(num_soilc, filter_soilc, num_soilp, filter_soilp, &
call CNHarvest(num_soilp, filter_soilp, &
soilbiogeochem_state_inst, cnveg_carbonstate_inst, cnveg_nitrogenstate_inst, &
cnveg_carbonflux_inst, cnveg_nitrogenflux_inst)
end if

if ( use_c13 ) then
call CIsoFlux2h(num_soilc, filter_soilc, num_soilp, filter_soilp, &
call CIsoFlux2h(num_soilp, filter_soilp, &
soilbiogeochem_state_inst, &
cnveg_carbonflux_inst, cnveg_carbonstate_inst, &
c13_cnveg_carbonflux_inst, c13_cnveg_carbonstate_inst, &
isotope='c13')
end if
if ( use_c14 ) then
call CIsoFlux2h(num_soilc, filter_soilc, num_soilp, filter_soilp, &
call CIsoFlux2h(num_soilp, filter_soilp, &
soilbiogeochem_state_inst, &
cnveg_carbonflux_inst, cnveg_carbonstate_inst, &
c14_cnveg_carbonflux_inst, c14_cnveg_carbonstate_inst, &
Expand Down Expand Up @@ -790,20 +790,20 @@ subroutine CNDriverNoLeaching(bounds,

! Set gross unrepresented landcover change mortality routine
if (get_do_grossunrep()) then
call CNGrossUnrep(num_soilc, filter_soilc, num_soilp, filter_soilp, &
call CNGrossUnrep(num_soilp, filter_soilp, &
soilbiogeochem_state_inst, cnveg_carbonstate_inst, cnveg_nitrogenstate_inst, &
cnveg_carbonflux_inst, cnveg_nitrogenflux_inst)
end if

if ( use_c13 ) then
call CIsoFlux2g(num_soilc, filter_soilc, num_soilp, filter_soilp, &
call CIsoFlux2g(num_soilp, filter_soilp, &
soilbiogeochem_state_inst, &
cnveg_carbonflux_inst, cnveg_carbonstate_inst, &
c13_cnveg_carbonflux_inst, c13_cnveg_carbonstate_inst, &
isotope='c13')
end if
if ( use_c14 ) then
call CIsoFlux2g(num_soilc, filter_soilc, num_soilp, filter_soilp, &
call CIsoFlux2g(num_soilp, filter_soilp, &
soilbiogeochem_state_inst, &
cnveg_carbonflux_inst, cnveg_carbonstate_inst, &
c14_cnveg_carbonflux_inst, c14_cnveg_carbonstate_inst, &
Expand Down Expand Up @@ -915,15 +915,15 @@ subroutine CNDriverNoLeaching(bounds,

call t_startf('CNUpdate3')
if ( use_c13 ) then
call CIsoFlux3(num_soilc, filter_soilc, num_soilp, filter_soilp, &
call CIsoFlux3(num_soilp, filter_soilp, &
soilbiogeochem_state_inst , soilbiogeochem_carbonstate_inst, &
cnveg_carbonflux_inst, cnveg_carbonstate_inst, &
c13_cnveg_carbonflux_inst, c13_cnveg_carbonstate_inst, &
c13_soilbiogeochem_carbonstate_inst, &
isotope='c13')
end if
if ( use_c14 ) then
call CIsoFlux3(num_soilc, filter_soilc, num_soilp, filter_soilp, &
call CIsoFlux3(num_soilp, filter_soilp, &
soilbiogeochem_state_inst , soilbiogeochem_carbonstate_inst, &
cnveg_carbonflux_inst, cnveg_carbonstate_inst, &
c14_cnveg_carbonflux_inst, c14_cnveg_carbonstate_inst, &
Expand Down
157 changes: 73 additions & 84 deletions src/biogeochem/CNGapMortalityMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ subroutine readParams ( ncid )
end subroutine readParams

!-----------------------------------------------------------------------
subroutine CNGapMortality (bounds, num_soilc, filter_soilc, num_soilp, filter_soilp, &
subroutine CNGapMortality (bounds, num_soilp, filter_soilp, &
dgvs_inst, cnveg_carbonstate_inst, cnveg_nitrogenstate_inst, soilbiogeochem_nitrogenflux_inst,&
cnveg_carbonflux_inst, cnveg_nitrogenflux_inst, canopystate_inst, &
leaf_prof_patch, froot_prof_patch, croot_prof_patch, stem_prof_patch)
Expand All @@ -99,8 +99,6 @@ subroutine CNGapMortality (bounds, num_soilc, filter_soilc, num_soilp, filter_so
!
! !ARGUMENTS:
type(bounds_type) , intent(in) :: bounds
integer , intent(in) :: num_soilc ! number of soil columns in filter
integer , intent(in) :: filter_soilc(:) ! column filter for soil points
integer , intent(in) :: num_soilp ! number of soil patches in filter
integer , intent(in) :: filter_soilp(:) ! patch filter for soil points
type(dgvs_type) , intent(inout) :: dgvs_inst
Expand Down Expand Up @@ -306,7 +304,7 @@ subroutine CNGapMortality (bounds, num_soilc, filter_soilc, num_soilp, filter_so
! gather all patch-level litterfall fluxes to the column
! for litter C and N inputs

call CNGap_PatchToColumn(bounds, num_soilc, filter_soilc, &
call CNGap_PatchToColumn(bounds, num_soilp, filter_soilp, &
cnveg_carbonflux_inst, cnveg_nitrogenflux_inst, &
leaf_prof_patch(bounds%begp:bounds%endp, 1:nlevdecomp_full), &
froot_prof_patch(bounds%begp:bounds%endp, 1:nlevdecomp_full), &
Expand All @@ -318,7 +316,7 @@ subroutine CNGapMortality (bounds, num_soilc, filter_soilc, num_soilp, filter_so
end subroutine CNGapMortality

!-----------------------------------------------------------------------
subroutine CNGap_PatchToColumn (bounds, num_soilc, filter_soilc, &
subroutine CNGap_PatchToColumn (bounds, num_soilp, filter_soilp, &
cnveg_carbonflux_inst, cnveg_nitrogenflux_inst, &
leaf_prof_patch, froot_prof_patch, croot_prof_patch, stem_prof_patch)
!
Expand All @@ -331,8 +329,8 @@ subroutine CNGap_PatchToColumn (bounds, num_soilc, filter_soilc, &
!
! !ARGUMENTS:
type(bounds_type) , intent(in) :: bounds
integer , intent(in) :: num_soilc ! number of soil columns in filter
integer , intent(in) :: filter_soilc(:) ! soil column filter
integer , intent(in) :: num_soilp ! number of soil patches in filter
integer , intent(in) :: filter_soilp(:) ! soil patch filter
type(cnveg_carbonflux_type) , intent(inout) :: cnveg_carbonflux_inst
type(cnveg_nitrogenflux_type) , intent(inout) :: cnveg_nitrogenflux_inst
real(r8) , intent(in) :: leaf_prof_patch(bounds%begp:,1:)
Expand All @@ -341,7 +339,7 @@ subroutine CNGap_PatchToColumn (bounds, num_soilc, filter_soilc, &
real(r8) , intent(in) :: stem_prof_patch(bounds%begp:,1:)
!
! !LOCAL VARIABLES:
integer :: fc,c,pi,p,j,i ! indices
integer :: fp,c,p,j,i ! indices
!-----------------------------------------------------------------------

SHR_ASSERT_ALL_FL((ubound(leaf_prof_patch) == (/bounds%endp,nlevdecomp_full/)), sourcefile, __LINE__)
Expand Down Expand Up @@ -408,84 +406,75 @@ subroutine CNGap_PatchToColumn (bounds, num_soilc, filter_soilc, &
)

do j = 1,nlevdecomp
do pi = 1,maxsoil_patches
do fc = 1,num_soilc
c = filter_soilc(fc)

if (pi <= col%npatches(c)) then
p = col%patchi(c) + pi - 1

if (patch%active(p)) then

do i = i_litr_min, i_litr_max
gap_mortality_c_to_litr_c(c,j,i) = &
gap_mortality_c_to_litr_c(c,j,i) + &
! leaf gap mortality carbon fluxes
m_leafc_to_litter(p) * lf_f(ivt(p),i) * wtcol(p) * leaf_prof(p,j) + &
! fine root gap mortality carbon fluxes
m_frootc_to_litter(p) * fr_f(ivt(p),i) * wtcol(p) * froot_prof(p,j)
end do

! wood gap mortality carbon fluxes
gap_mortality_c_to_cwdc(c,j) = gap_mortality_c_to_cwdc(c,j) + &
(m_livestemc_to_litter(p) + m_deadstemc_to_litter(p)) * wtcol(p) * stem_prof(p,j)
gap_mortality_c_to_cwdc(c,j) = gap_mortality_c_to_cwdc(c,j) + &
(m_livecrootc_to_litter(p) + m_deadcrootc_to_litter(p)) * wtcol(p) * croot_prof(p,j)

! storage gap mortality carbon fluxes
! Metabolic litter is treated differently than other types
! of litter, so it gets this additional line after the
! most recent loop over all litter types
gap_mortality_c_to_litr_c(c,j,i_met_lit) = &
gap_mortality_c_to_litr_c(c,j,i_met_lit) + &
(m_leafc_storage_to_litter(p) + m_gresp_storage_to_litter(p)) * wtcol(p) * leaf_prof(p,j) + &
m_frootc_storage_to_litter(p) * wtcol(p) * froot_prof(p,j) + &
(m_livestemc_storage_to_litter(p) + m_deadstemc_storage_to_litter(p)) * wtcol(p) * stem_prof(p,j) + &
(m_livecrootc_storage_to_litter(p) + m_deadcrootc_storage_to_litter(p)) * wtcol(p) * croot_prof(p,j) + &

! transfer gap mortality carbon fluxes
(m_leafc_xfer_to_litter(p) + m_gresp_xfer_to_litter(p)) * wtcol(p) * leaf_prof(p,j) + &
m_frootc_xfer_to_litter(p) * wtcol(p) * froot_prof(p,j) + &
(m_livestemc_xfer_to_litter(p) + m_deadstemc_xfer_to_litter(p)) * wtcol(p) * stem_prof(p,j) + &
(m_livecrootc_xfer_to_litter(p) + m_deadcrootc_xfer_to_litter(p)) * wtcol(p) * croot_prof(p,j)

do i = i_litr_min, i_litr_max
gap_mortality_n_to_litr_n(c,j,i) = &
gap_mortality_n_to_litr_n(c,j,i) + &
! leaf gap mortality nitrogen fluxes
m_leafn_to_litter(p) * lf_f(ivt(p),i) * wtcol(p) * leaf_prof(p,j) + &
! fine root litter nitrogen fluxes
m_frootn_to_litter(p) * fr_f(ivt(p),i) * wtcol(p) * froot_prof(p,j)
end do

! wood gap mortality nitrogen fluxes
gap_mortality_n_to_cwdn(c,j) = gap_mortality_n_to_cwdn(c,j) + &
(m_livestemn_to_litter(p) + m_deadstemn_to_litter(p)) * wtcol(p) * stem_prof(p,j)
gap_mortality_n_to_cwdn(c,j) = gap_mortality_n_to_cwdn(c,j) + &
(m_livecrootn_to_litter(p) + m_deadcrootn_to_litter(p)) * wtcol(p) * croot_prof(p,j)

! Metabolic litter is treated differently than other types
! of litter, so it gets this additional line after the
! most recent loop over all litter types
gap_mortality_n_to_litr_n(c,j,i_met_lit) = &
gap_mortality_n_to_litr_n(c,j,i_met_lit) + &
! retranslocated N pool gap mortality fluxes
m_retransn_to_litter(p) * wtcol(p) * leaf_prof(p,j) + &
! storage gap mortality nitrogen fluxes
m_leafn_storage_to_litter(p) * wtcol(p) * leaf_prof(p,j) + &
m_frootn_storage_to_litter(p) * wtcol(p) * froot_prof(p,j) + &
(m_livestemn_storage_to_litter(p) + m_deadstemn_storage_to_litter(p)) * wtcol(p) * stem_prof(p,j) + &
(m_livecrootn_storage_to_litter(p) + m_deadcrootn_storage_to_litter(p)) * wtcol(p) * croot_prof(p,j) + &
! transfer gap mortality nitrogen fluxes
m_leafn_xfer_to_litter(p) * wtcol(p) * leaf_prof(p,j) + &
m_frootn_xfer_to_litter(p) * wtcol(p) * froot_prof(p,j) + &
(m_livestemn_xfer_to_litter(p) + m_deadstemn_xfer_to_litter(p)) * wtcol(p) * stem_prof(p,j) + &
(m_livecrootn_xfer_to_litter(p) + m_deadcrootn_xfer_to_litter(p)) * wtcol(p) * croot_prof(p,j)

end if
end if
do fp = 1,num_soilp
p = filter_soilp(fp)
c = patch%column(p)

do i = i_litr_min, i_litr_max
gap_mortality_c_to_litr_c(c,j,i) = &
gap_mortality_c_to_litr_c(c,j,i) + &
! leaf gap mortality carbon fluxes
m_leafc_to_litter(p) * lf_f(ivt(p),i) * wtcol(p) * leaf_prof(p,j) + &
! fine root gap mortality carbon fluxes
m_frootc_to_litter(p) * fr_f(ivt(p),i) * wtcol(p) * froot_prof(p,j)
end do

! wood gap mortality carbon fluxes
gap_mortality_c_to_cwdc(c,j) = gap_mortality_c_to_cwdc(c,j) + &
(m_livestemc_to_litter(p) + m_deadstemc_to_litter(p)) * wtcol(p) * stem_prof(p,j)
gap_mortality_c_to_cwdc(c,j) = gap_mortality_c_to_cwdc(c,j) + &
(m_livecrootc_to_litter(p) + m_deadcrootc_to_litter(p)) * wtcol(p) * croot_prof(p,j)

! storage gap mortality carbon fluxes
! Metabolic litter is treated differently than other types
! of litter, so it gets this additional line after the
! most recent loop over all litter types
gap_mortality_c_to_litr_c(c,j,i_met_lit) = &
gap_mortality_c_to_litr_c(c,j,i_met_lit) + &
(m_leafc_storage_to_litter(p) + m_gresp_storage_to_litter(p)) * wtcol(p) * leaf_prof(p,j) + &
m_frootc_storage_to_litter(p) * wtcol(p) * froot_prof(p,j) + &
(m_livestemc_storage_to_litter(p) + m_deadstemc_storage_to_litter(p)) * wtcol(p) * stem_prof(p,j) + &
(m_livecrootc_storage_to_litter(p) + m_deadcrootc_storage_to_litter(p)) * wtcol(p) * croot_prof(p,j) + &

! transfer gap mortality carbon fluxes
(m_leafc_xfer_to_litter(p) + m_gresp_xfer_to_litter(p)) * wtcol(p) * leaf_prof(p,j) + &
m_frootc_xfer_to_litter(p) * wtcol(p) * froot_prof(p,j) + &
(m_livestemc_xfer_to_litter(p) + m_deadstemc_xfer_to_litter(p)) * wtcol(p) * stem_prof(p,j) + &
(m_livecrootc_xfer_to_litter(p) + m_deadcrootc_xfer_to_litter(p)) * wtcol(p) * croot_prof(p,j)

do i = i_litr_min, i_litr_max
gap_mortality_n_to_litr_n(c,j,i) = &
gap_mortality_n_to_litr_n(c,j,i) + &
! leaf gap mortality nitrogen fluxes
m_leafn_to_litter(p) * lf_f(ivt(p),i) * wtcol(p) * leaf_prof(p,j) + &
! fine root litter nitrogen fluxes
m_frootn_to_litter(p) * fr_f(ivt(p),i) * wtcol(p) * froot_prof(p,j)
end do

! wood gap mortality nitrogen fluxes
gap_mortality_n_to_cwdn(c,j) = gap_mortality_n_to_cwdn(c,j) + &
(m_livestemn_to_litter(p) + m_deadstemn_to_litter(p)) * wtcol(p) * stem_prof(p,j)
gap_mortality_n_to_cwdn(c,j) = gap_mortality_n_to_cwdn(c,j) + &
(m_livecrootn_to_litter(p) + m_deadcrootn_to_litter(p)) * wtcol(p) * croot_prof(p,j)

! Metabolic litter is treated differently than other types
! of litter, so it gets this additional line after the
! most recent loop over all litter types
gap_mortality_n_to_litr_n(c,j,i_met_lit) = &
gap_mortality_n_to_litr_n(c,j,i_met_lit) + &
! retranslocated N pool gap mortality fluxes
m_retransn_to_litter(p) * wtcol(p) * leaf_prof(p,j) + &
! storage gap mortality nitrogen fluxes
m_leafn_storage_to_litter(p) * wtcol(p) * leaf_prof(p,j) + &
m_frootn_storage_to_litter(p) * wtcol(p) * froot_prof(p,j) + &
(m_livestemn_storage_to_litter(p) + m_deadstemn_storage_to_litter(p)) * wtcol(p) * stem_prof(p,j) + &
(m_livecrootn_storage_to_litter(p) + m_deadcrootn_storage_to_litter(p)) * wtcol(p) * croot_prof(p,j) + &
! transfer gap mortality nitrogen fluxes
m_leafn_xfer_to_litter(p) * wtcol(p) * leaf_prof(p,j) + &
m_frootn_xfer_to_litter(p) * wtcol(p) * froot_prof(p,j) + &
(m_livestemn_xfer_to_litter(p) + m_deadstemn_xfer_to_litter(p)) * wtcol(p) * stem_prof(p,j) + &
(m_livecrootn_xfer_to_litter(p) + m_deadcrootn_xfer_to_litter(p)) * wtcol(p) * croot_prof(p,j)

end do
end do

Expand Down
Loading