Skip to content

Commit

Permalink
fix base rebase, rename dispersal subroutines
Browse files Browse the repository at this point in the history
  • Loading branch information
glemieux committed Oct 18, 2023
1 parent c5711f7 commit c811ae9
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/utils/clmfates_interfaceMod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ module CLMFatesInterfaceMod
procedure, public :: wrap_hydraulics_drive
procedure, public :: WrapUpdateFatesRmean
procedure, public :: wrap_WoodProducts
procedure, public :: WrapSeedGlobal
procedure, public :: WrapGlobalSeedDispersal
procedure, public :: WrapUpdateFatesSeedInOut
procedure, public :: UpdateCLitterFluxes
procedure, public :: UpdateNLitterFluxes
Expand Down Expand Up @@ -1061,7 +1061,7 @@ subroutine dynamics_driv(this, nc, bounds_clump, &
call UnPackNutrientAquisitionBCs(this%fates(nc)%sites, this%fates(nc)%bc_in)

! Distribute any seeds from neighboring gridcells into the current gridcell
! Global seed availability array populated by WrapSeedGlobal call
! Global seed availability array populated by WrapGlobalSeedDispersal call
if (fates_seeddisp_cadence /= fates_dispersal_cadence_none) then
call this%WrapUpdateFatesSeedInOut(bounds_clump)
end if
Expand Down Expand Up @@ -1855,7 +1855,7 @@ subroutine restart( this, bounds_proc, ncid, flag, waterdiagnosticbulk_inst, &

! Disperse seeds
if (fates_seeddisp_cadence /= fates_dispersal_cadence_none) then
call this%WrapSeedGlobal(is_restart_flag=.true.)
call this%WrapGlobalSeedDispersal(is_restart_flag=.true.)
end if

end if
Expand Down Expand Up @@ -2648,7 +2648,7 @@ end subroutine wrap_canopy_radiation

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

subroutine WrapSeedGlobal(this,is_restart_flag)
subroutine WrapGlobalSeedDispersal(this,is_restart_flag)

! Call mpi procedure to provide the global seed output distribution array to every gridcell.
! This could be conducted with a more sophisticated halo-type structure or distributed graph.
Expand Down Expand Up @@ -2724,13 +2724,13 @@ subroutine WrapSeedGlobal(this,is_restart_flag)

call t_stopf('fates-seed-mpi_reduce')

end subroutine WrapSeedGlobal
end subroutine WrapGlobalSeedDispersal

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

subroutine WrapUpdateFatesSeedInOut(this,bounds_clump)

! This subroutine passes the globally dispersed seed via WrapSeedGlobal, incoming_global
! This subroutine passes the globally dispersed seed via WrapGlobalSeedDispersal, incoming_global
! to the fates local process seed_in site object. It also resets the fates seed_out
! in preparation for fates to update the seeds being dispersed out.

Expand Down

0 comments on commit c811ae9

Please sign in to comment.