Skip to content

Commit

Permalink
Merge pull request NGEET#18 from glemieux/edpatchdyn-refactor-condens…
Browse files Browse the repository at this point in the history 
…e-common

Landuse V2: Condense copying of means and timers into a common subroutine
  • Loading branch information
@glemieux
glemieux authored May 8, 2024
2 parents 153b0bd + c090218 commit ff16157
Showing 1 changed file with 43 additions and 61 deletions.
104 changes: 43 additions & 61 deletions biogeochem/EDPatchDynamicsMod.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -764,10 +764,11 @@ subroutine spawn_patches( currentSite, bc_in)
currentPatch%burnt_frac_litter(:) = 0._r8
end if

call CopyPatchMeansTimers(currentPatch, newPatch)

call TransLitterNewPatch( currentSite, currentPatch, newPatch, patch_site_areadis)

! Transfer in litter fluxes from plants in various contexts of death and destruction

select case(i_disturbance_type)
case (dtype_ilog)
call logging_litter_fluxes(currentSite, currentPatch, &
Expand Down Expand Up @@ -797,27 +798,6 @@ subroutine spawn_patches( currentSite, bc_in)
call endrun(msg=errMsg(sourcefile, __LINE__))
end select


! Copy any means or timers from the original patch to the new patch
! These values will inherit all info from the original patch
! --------------------------------------------------------------------------
call newPatch%tveg24%CopyFromDonor(currentPatch%tveg24)
call newPatch%tveg_lpa%CopyFromDonor(currentPatch%tveg_lpa)
call newPatch%tveg_longterm%CopyFromDonor(currentPatch%tveg_longterm)


if ( regeneration_model == TRS_regeneration ) then
call newPatch%seedling_layer_par24%CopyFromDonor(currentPatch%seedling_layer_par24)
call newPatch%sdlng_mort_par%CopyFromDonor(currentPatch%sdlng_mort_par)
call newPatch%sdlng2sap_par%CopyFromDonor(currentPatch%sdlng2sap_par)
do pft = 1,numpft
call newPatch%sdlng_emerg_smp(pft)%p%CopyFromDonor(currentPatch%sdlng_emerg_smp(pft)%p)
call newPatch%sdlng_mdd(pft)%p%CopyFromDonor(currentPatch%sdlng_mdd(pft)%p)
enddo
end if

call newPatch%tveg_longterm%CopyFromDonor(currentPatch%tveg_longterm)

! --------------------------------------------------------------------------
! The newly formed patch from disturbance (newPatch), has now been given
! some litter from dead plants and pre-existing litter from the donor patches.
Expand Down Expand Up @@ -1419,9 +1399,6 @@ subroutine spawn_patches( currentSite, bc_in)
hlm_numSWb, numpft, currentSite%nlevsoil, hlm_current_tod, &
regeneration_model)

! make a note that this buffer patch has not been put into the linked list
buffer_patch_in_linked_list = .false.

! Initialize the litter pools to zero
do el=1,num_elements
call buffer_patch%litter(el)%InitConditions(init_leaf_fines=0._r8, &
Expand All @@ -1434,22 +1411,10 @@ subroutine spawn_patches( currentSite, bc_in)
buffer_patch%tallest => null()
buffer_patch%shortest => null()

! Copy any means or timers from the original patch to the new patch
! These values will inherit all info from the original patch
! --------------------------------------------------------------------------
call buffer_patch%tveg24%CopyFromDonor(copyPatch%tveg24)
call buffer_patch%tveg_lpa%CopyFromDonor(copyPatch%tveg_lpa)
call buffer_patch%tveg_longterm%CopyFromDonor(copyPatch%tveg_longterm)

if ( regeneration_model == TRS_regeneration ) then
call buffer_patch%seedling_layer_par24%CopyFromDonor(copyPatch%seedling_layer_par24)
call buffer_patch%sdlng_mort_par%CopyFromDonor(copyPatch%sdlng_mort_par)
call buffer_patch%sdlng2sap_par%CopyFromDonor(copyPatch%sdlng2sap_par)
do pft = 1,numpft
call buffer_patch%sdlng_emerg_smp(pft)%p%CopyFromDonor(copyPatch%sdlng_emerg_smp(pft)%p)
call buffer_patch%sdlng_mdd(pft)%p%CopyFromDonor(copyPatch%sdlng_mdd(pft)%p)
enddo
end if
call CopyPatchMeansTimers(copyPatch, buffer_patch)

! make a note that this buffer patch has not been put into the linked list
buffer_patch_in_linked_list = .false.
buffer_patch_used = .false.

currentPatch => currentSite%oldest_patch
Expand Down Expand Up @@ -1656,8 +1621,8 @@ subroutine split_patch(currentSite, currentPatch, new_patch, fraction_to_keep)
!
! !ARGUMENTS:
type(ed_site_type),intent(inout) :: currentSite
type(fates_patch_type) , intent(inout), target :: currentPatch ! Donor Patch
type(fates_patch_type) , intent(inout), target :: new_patch ! New Patch
type(fates_patch_type) , intent(inout), pointer :: currentPatch ! Donor Patch
type(fates_patch_type) , intent(inout), pointer :: new_patch ! New Patch
real(r8), intent(in) :: fraction_to_keep ! fraction of currentPatch to keep, the rest goes to newpatch
!
! !LOCAL VARIABLES:
Expand Down Expand Up @@ -1686,30 +1651,15 @@ subroutine split_patch(currentSite, currentPatch, new_patch, fraction_to_keep)
init_seed=0._r8, &
init_seed_germ=0._r8)
end do

new_patch%tallest => null()
new_patch%shortest => null()

! Copy any means or timers from the original patch to the new patch
! These values will inherit all info from the original patch
! --------------------------------------------------------------------------
call new_patch%tveg24%CopyFromDonor(currentPatch%tveg24)
call new_patch%tveg_lpa%CopyFromDonor(currentPatch%tveg_lpa)
call new_patch%tveg_longterm%CopyFromDonor(currentPatch%tveg_longterm)
call CopyPatchMeansTimers(currentPatch, new_patch)

if ( regeneration_model == TRS_regeneration ) then
call new_patch%seedling_layer_par24%CopyFromDonor(currentPatch%seedling_layer_par24)
call new_patch%sdlng_mort_par%CopyFromDonor(currentPatch%sdlng_mort_par)
call new_patch%sdlng2sap_par%CopyFromDonor(currentPatch%sdlng2sap_par)
do pft = 1,numpft
call new_patch%sdlng_emerg_smp(pft)%p%CopyFromDonor(currentPatch%sdlng_emerg_smp(pft)%p)
call new_patch%sdlng_mdd(pft)%p%CopyFromDonor(currentPatch%sdlng_mdd(pft)%p)
enddo
end if

currentPatch%burnt_frac_litter(:) = 0._r8
call TransLitterNewPatch( currentSite, currentPatch, new_patch, currentPatch%area * (1.-fraction_to_keep))

currentPatch%burnt_frac_litter(:) = 0._r8

! Next, we loop through the cohorts in the donor patch, copy them with
! area modified number density into the new-patch, and apply survivorship.
! -------------------------------------------------------------------------
Expand Down Expand Up @@ -3974,4 +3924,36 @@ subroutine InsertPatch(currentSite, newPatch)

end subroutine InsertPatch

! =====================================================================================

subroutine CopyPatchMeansTimers(dp, rp)

! !DESCRIPTION:
! Copy any means or timers from the original patch to the new patch
! These values will inherit all info from the original patch
! --------------------------------------------------------------------------
!
! !ARGUMENTS:
type (fates_patch_type), intent(in) :: dp ! Donor Patch
type (fates_patch_type), intent(inout) :: rp ! Recipient Patch

! LOCAL:
integer :: ipft ! pft index

call rp%tveg24%CopyFromDonor(dp%tveg24)
call rp%tveg_lpa%CopyFromDonor(dp%tveg_lpa)
call rp%tveg_longterm%CopyFromDonor(dp%tveg_longterm)

if ( regeneration_model == TRS_regeneration ) then
call rp%seedling_layer_par24%CopyFromDonor(dp%seedling_layer_par24)
call rp%sdlng_mort_par%CopyFromDonor(dp%sdlng_mort_par)
call rp%sdlng2sap_par%CopyFromDonor(dp%sdlng2sap_par)
do ipft = 1,numpft
call rp%sdlng_emerg_smp(ipft)%p%CopyFromDonor(dp%sdlng_emerg_smp(ipft)%p)
call rp%sdlng_mdd(ipft)%p%CopyFromDonor(dp%sdlng_mdd(ipft)%p)
enddo
end if

end subroutine CopyPatchMeansTimers

end module EDPatchDynamicsMod

0 comments on commit ff16157

Please sign in to comment.