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

Fix mean vegetation temperature output for exact restarts #914

Merged
merged 9 commits into from
Oct 12, 2022
Merged

Fix mean vegetation temperature output for exact restarts #914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7551d46
add bareground area_pft calculation to restart
glemieux Sep 24, 2022
44d2f59
add missing end if to nocomp check
glemieux Oct 5, 2022
c9739ba
add check to avoid conducting tveg running means calculation on bareg…
glemieux Oct 5, 2022
a28ca74
refactor area_pft checks and add check against notional area
glemieux Oct 6, 2022
1ee7fe8
update restart area_pft check to use tolerance
glemieux Oct 6, 2022
2eb6cdf
add missing nearzero use call
glemieux Oct 6, 2022
8392331
Revert "refactor area_pft checks and add check against notional area"
glemieux Oct 6, 2022
7ba71f5
add fixed biogeo check to restart calc
glemieux Oct 6, 2022
5fa6ca3
add fixed biogeo use statement
glemieux Oct 7, 2022
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: 2 additions & 0 deletions main/FatesInterfaceMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1926,6 +1926,7 @@ subroutine UpdateFatesRMeansTStep(sites,bc_in)
ifp=0
cpatch => sites(s)%oldest_patch
do while(associated(cpatch))
if (cpatch%patchno .ne. 0) then
ifp=ifp+1
call cpatch%tveg24%UpdateRMean(bc_in(s)%t_veg_pa(ifp))
call cpatch%tveg_lpa%UpdateRMean(bc_in(s)%t_veg_pa(ifp))
Expand All @@ -1936,6 +1937,7 @@ subroutine UpdateFatesRMeansTStep(sites,bc_in)
! call ccohort%tveg_lpa%UpdateRMean(bc_in(s)%t_veg_pa(ifp))
! ccohort => ccohort%shorter
!end do
end if

cpatch => cpatch%younger
enddo
Expand Down
15 changes: 13 additions & 2 deletions main/FatesRestartInterfaceMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ module FatesRestartInterfaceMod
use FatesConstantsMod, only : ifalse
use FatesConstantsMod, only : fates_unset_r8, fates_unset_int
use FatesConstantsMod, only : primaryforest
use FatesConstantsMod, only : nearzero
use FatesGlobals, only : fates_log
use FatesGlobals, only : endrun => fates_endrun
use FatesIODimensionsMod, only : fates_io_dimension_type
Expand All @@ -19,6 +20,7 @@ module FatesRestartInterfaceMod
use FatesInterfaceTypesMod, only : bc_out_type
use FatesInterfaceTypesMod, only : hlm_use_planthydro
use FatesInterfaceTypesMod, only : hlm_use_sp
use FatesInterfaceTypesMod, only : hlm_use_nocomp, hlm_use_fixed_biogeog
use FatesInterfaceTypesMod, only : fates_maxElementsPerSite
use EDCohortDynamicsMod, only : UpdateCohortBioPhysRates
use FatesHydraulicsMemMod, only : nshell
Expand All @@ -36,7 +38,7 @@ module FatesRestartInterfaceMod
use FatesLitterMod, only : litter_type
use FatesLitterMod, only : ncwd
use FatesLitterMod, only : ndcmpy
use EDTypesMod, only : nfsc
use EDTypesMod, only : nfsc, nlevleaf, area
use PRTGenericMod, only : prt_global
use PRTGenericMod, only : num_elements
use FatesRunningMeanMod, only : rmean_type
Expand Down Expand Up @@ -2685,12 +2687,21 @@ subroutine get_restart_vectors(this, nc, nsites, sites)
sites(s)%recruitment_rate(i_pft) = rio_recrate_sift(io_idx_co_1st+i_pft-1)
enddo

!variables for fixed biogeography mode. These are currently used in restart even when this is off.
! variables for fixed biogeography mode. These are currently used in restart even when this is off.
do i_pft = 1,numpft
sites(s)%use_this_pft(i_pft) = rio_use_this_pft_sift(io_idx_co_1st+i_pft-1)
sites(s)%area_pft(i_pft) = rio_area_pft_sift(io_idx_co_1st+i_pft-1)
enddo

! calculate the bareground area for the pft in no competition + fixed biogeo modes
if (hlm_use_nocomp .eq. itrue .and. hlm_use_fixed_biogeog .eq. itrue) then
if (area-sum(sites(s)%area_pft(1:numpft)) .gt. nearzero) then
sites(s)%area_pft(0) = area - sum(sites(s)%area_pft(1:numpft))
else
sites(s)%area_pft(0) = 0.0_r8
endif
endif

! Mass balance and diagnostics across elements at the site level
do el = 1, num_elements

Expand Down