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

Updates and fixes to history zeroing and flushing #1208

Merged
merged 9 commits into from
Jun 11, 2024
Merged

Updates and fixes to history zeroing and flushing #1208

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1889a9f
Updates and fixes to zeroing and flushing
rgknox May 23, 2024
7d0876d
updated the group_nflx_ specifications for the variables
rgknox May 23, 2024
c82918f
Removed unnecessary dynamics flushing
rgknox May 28, 2024
b9a8f43
Added flush_all_hvars to be used by interface calls in cold-start and…
rgknox May 28, 2024
3d799f9
bug fix for history refactors
rgknox May 28, 2024
9d8f404
updates to c13 disc
rgknox May 29, 2024
7a3c437
update to cached gpp in c13 disc
rgknox May 29, 2024
e407b81
Updated some text
rgknox Jun 10, 2024
8d028eb
removed redundant zero flush in history
rgknox Jun 10, 2024
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
6 changes: 0 additions & 6 deletions main/EDMainMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,12 +166,6 @@ subroutine ed_ecosystem_dynamics(currentSite, bc_in, bc_out)
call currentSite%flux_diags(el)%ZeroFluxDiags()
end do

! zero dynamics (upfreq_in = 1) output history variables
call fates_hist%zero_site_hvars(currentSite,upfreq_in=1)

! zero nutrient fluxes (upfreq_in=5) output hist variables
call fates_hist%zero_site_hvars(currentSite,upfreq_in=5)

! Call a routine that simply identifies if logging should occur
! This is limited to a global event until more structured event handling is enabled
call IsItLoggingTime(hlm_masterproc,currentSite)
Expand Down
21 changes: 19 additions & 2 deletions main/EDTypesMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,13 @@ module EDTypesMod
type, public :: site_fluxdiags_type

! ----------------------------------------------------------------------------------
! Diagnostics for fluxes into the litter pool from plants
! these fluxes are the total from
! Diagnostics of fluxes
! These act as an intermediary to write fluxes to the history
! file after number densities of plants have changed. They also
! allow the history flux diagnostics to be rebuilt during restart
!
!
! Litter fluxes are the total from
! (1) turnover from living plants
! (2) mass transfer from non-disturbance inducing mortality events
! (3) mass transfer from disturbance inducing mortality events
Expand All @@ -162,6 +167,13 @@ module EDTypesMod
real(r8) :: cwd_bg_input(1:ncwd)
real(r8),allocatable :: leaf_litter_input(:)
real(r8),allocatable :: root_litter_input(:)

! This variable is slated as to-do, but the fluxdiags type needs
! to be refactored first. Currently this type is allocated
! by chemical species (ie C, N or P). GPP is C, but not N or P (RGK 0524)
! Previous day GPP [kgC/m2/year], partitioned by size x pft
!real(r8),allocatable :: gpp_prev_scpf(:)


contains

Expand Down Expand Up @@ -464,6 +476,11 @@ subroutine ZeroFluxDiags(this)
this%cwd_bg_input(:) = 0._r8
this%leaf_litter_input(:) = 0._r8
this%root_litter_input(:) = 0._r8

! We don't zero gpp_prev_scpf because this is not
! incremented like others, it is assigned at the end
! of the daily history write process


return
end subroutine ZeroFluxDiags
Expand Down
Loading