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

fates history flushing #2594

Merged
merged 14 commits into from
Sep 5, 2024
Merged

fates history flushing #2594

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5b40c48
removed unnecessary zeroing calls for fates history, they are called …
rgknox May 29, 2024
fbe292d
removing c13 from allvars until it is fixed
rgknox Jun 10, 2024
be904a7
using flush_allvars
rgknox Jun 10, 2024
34d7be9
removing unused use statements
rgknox Jun 10, 2024
a000f9c
Merge tag 'ctsm5.2.015' into fates-hist-flush
glemieux Jul 24, 2024
838ea5f
move fates and update land use history outputs
glemieux Jul 24, 2024
4728918
update fates satellite phenology test coverage
glemieux Jul 24, 2024
d393cbf
update fates tag
glemieux Jul 26, 2024
cc96bed
fix fates history output type in LUH2 tests
glemieux Jul 27, 2024
aa26cc5
Merge tag 'ctsm5.2.027' into fates-hist-flush
glemieux Aug 29, 2024
9afb921
update fates tag to latest
glemieux Aug 29, 2024
04d45c7
add changelog
glemieux Sep 5, 2024
9a6cd44
correct changelog and sum author
glemieux Sep 5, 2024
249f850
Update date in change files
ekluzek Sep 5, 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
2 changes: 1 addition & 1 deletion cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ hist_fincl1 = 'FATES_TLONGTERM',
'FATES_MORTALITY_CROWNSCORCH_SZPF','FATES_MORTALITY_CAMBIALBURN_SZPF','FATES_MORTALITY_TERMINATION_SZPF',
'FATES_MORTALITY_LOGGING_SZPF','FATES_MORTALITY_FREEZING_SZPF','FATES_MORTALITY_SENESCENCE_SZPF',
'FATES_MORTALITY_AGESCEN_SZPF','FATES_MORTALITY_AGESCEN_ACPF','FATES_MORTALITY_CANOPY_SZPF',
'FATES_M3_MORTALITY_CANOPY_SZPF','FATES_M3_MORTALITY_USTORY_SZPF','FATES_C13DISC_SZPF',
'FATES_M3_MORTALITY_CANOPY_SZPF','FATES_M3_MORTALITY_USTORY_SZPF',
'FATES_STOREC_CANOPY_SZPF','FATES_LEAFC_CANOPY_SZPF','FATES_LAI_CANOPY_SZPF','FATES_CROWNAREA_CANOPY_SZPF',
'FATES_CROWNAREA_USTORY_SZPF','FATES_NPLANT_CANOPY_SZPF','FATES_MORTALITY_USTORY_SZPF','FATES_STOREC_USTORY_SZPF',
'FATES_LEAFC_USTORY_SZPF','FATES_LAI_USTORY_SZPF','FATES_NPLANT_USTORY_SZPF','FATES_CWD_ABOVEGROUND_DC',
Expand Down
58 changes: 16 additions & 42 deletions src/utils/clmfates_interfaceMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,6 @@ module CLMFatesInterfaceMod
use FatesParametersInterface, only : fates_parameters_type

use FatesInterfaceMod , only : DetermineGridCellNeighbors
use FatesIOVariableKindMod, only : group_dyna_simple, group_dyna_complx
use FatesHistoryInterfaceMod, only : fates_hist
use FatesRestartInterfaceMod, only : fates_restart_interface_type

Expand Down Expand Up @@ -1192,14 +1191,6 @@ subroutine dynamics_driv(this, nc, bounds_clump, &
call this%WrapUpdateFatesSeedInOut(bounds_clump)
end if

! ---------------------------------------------------------------------------------
! Flush arrays to values defined by %flushval (see registry entry in
! subroutine define_history_vars()
! ---------------------------------------------------------------------------------
call fates_hist%flush_hvars(nc,upfreq_in=group_dyna_simple)

call fates_hist%flush_hvars(nc,upfreq_in=group_dyna_complx)

! ---------------------------------------------------------------------------------
! Part II: Call the FATES model now that input boundary conditions have been
! provided.
Expand Down Expand Up @@ -1970,23 +1961,16 @@ subroutine restart( this, bounds_proc, ncid, flag, waterdiagnosticbulk_inst, &
this%fates(nc)%sites, &
this%fates(nc)%bc_out)


! ------------------------------------------------------------------------
! Update history IO fields that depend on ecosystem dynamics
! Flush FATES history variables.
! The flushing process sets all columns outside of FATES perview to
! the ignore value. This only needs to be done once, because FATES will
! not overwright values outside the columns that it is in charge of.
! ------------------------------------------------------------------------
if(fates_history_dimlevel(2)>0) then
call fates_hist%flush_hvars(nc,upfreq_in=group_dyna_simple)
do s = 1,this%fates(nc)%nsites
call fates_hist%zero_site_hvars(this%fates(nc)%sites(s), &
upfreq_in=group_dyna_simple)
end do
if(fates_history_dimlevel(2)>1) then
call fates_hist%flush_hvars(nc,upfreq_in=group_dyna_complx)
do s = 1,this%fates(nc)%nsites
call fates_hist%zero_site_hvars(this%fates(nc)%sites(s), &
upfreq_in=group_dyna_complx)
end do
end if
end if

call fates_hist%flush_all_hvars(nc)

call fates_hist%update_history_dyn( nc, &
this%fates(nc)%nsites, &
this%fates(nc)%sites, &
Expand Down Expand Up @@ -2164,22 +2148,15 @@ subroutine init_coldstart(this, waterstatebulk_inst, waterdiagnosticbulk_inst, &
soilbiogeochem_carbonflux_inst, .false.)

! ------------------------------------------------------------------------
! Update history IO fields that depend on ecosystem dynamics
! Flush and zero FATES history variables.
! The flushing process sets all columns outside of FATES perview to
! the ignore value. This only needs to be done once, because FATES will
! not overwright values outside the columns that it is in charge of.
! We also start off by setting all values on FATES columns to zero.
! ------------------------------------------------------------------------
if(fates_history_dimlevel(2)>0) then
call fates_hist%flush_hvars(nc,upfreq_in=group_dyna_simple)
do s = 1,this%fates(nc)%nsites
call fates_hist%zero_site_hvars(this%fates(nc)%sites(s), &
upfreq_in=group_dyna_simple)
end do
if(fates_history_dimlevel(2)>1) then
call fates_hist%flush_hvars(nc,upfreq_in=group_dyna_complx)
do s = 1,this%fates(nc)%nsites
call fates_hist%zero_site_hvars(this%fates(nc)%sites(s), &
upfreq_in=group_dyna_complx)
end do
end if
end if

call fates_hist%flush_all_hvars(nc)

call fates_hist%update_history_dyn( nc, &
this%fates(nc)%nsites, &
this%fates(nc)%sites, &
Expand Down Expand Up @@ -3570,9 +3547,6 @@ subroutine wrap_hydraulics_drive(this, bounds_clump, nc, &
this%fates(nc)%bc_out(s)%plant_stored_h2o_si
end do


! Update History Buffers that need to be updated after hydraulics calls

call fates_hist%update_history_hydraulics(nc, &
this%fates(nc)%nsites, &
this%fates(nc)%sites, &
Expand Down
Loading