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 FATES branch runs #2955

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fix FATES branch runs #2955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d51246e
Avoid pass_is_restart=1 on branch runs.
samsrabin Feb 6, 2025
9643c97
Don't call clm_fates%init_coldstart for branch runs.
samsrabin Feb 6, 2025
c0561fd
In Fates* testmods, only use hist_mfilt = 1.
samsrabin Feb 6, 2025
1d70d19
Change hist_mfilt to avoid ERI problems w/ two non-FATES testmods.
samsrabin Feb 6, 2025
70e20f2
Change two FATES ERS tests to ERI.
samsrabin Feb 13, 2025
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
4 changes: 2 additions & 2 deletions cime_config/testdefs/testlist_clm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2805,7 +2805,7 @@
<option name="comment" >Ensure functionality of the tree damage option in FATES</option>
</options>
</test>
<test name="ERS_D_Ld20" grid="f45_f45_mg37" compset="I2000Clm50FatesRs" testmods="clm/FatesColdTwoStream">
<test name="ERI_D_Ld20" grid="f45_f45_mg37" compset="I2000Clm50FatesRs" testmods="clm/FatesColdTwoStream">
<machines>
<machine name="derecho" compiler="intel" category="fates"/>
<machine name="derecho" compiler="intel" category="aux_clm"/>
Expand Down Expand Up @@ -3247,7 +3247,7 @@
<option name="comment">Exact restart debug FATES test providing coverage for Clm45 physics.</option>
</options>
</test>
<test name="ERS_Ld60" grid="f45_f45_mg37" compset="I2000Clm50FatesCruRsGs" testmods="clm/Fates">
<test name="ERI_Ld60" grid="f45_f45_mg37" compset="I2000Clm50FatesCruRsGs" testmods="clm/Fates">
<machines>
<machine name="derecho" compiler="intel" category="fates"/>
<machine name="lawrencium-lr3" compiler="intel" category="fates"/>
Expand Down
2 changes: 1 addition & 1 deletion cime_config/testdefs/testmods_dirs/clm/Fates/user_nl_clm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
!! USES THE DEFAULT INITIALIZATION FILE SPECIFIED IN bld/namelist_files/namelist_defaults_ctsm.xml
hist_mfilt = 365
hist_mfilt = 1
hist_nhtfrq = -24
hist_empty_htapes = .true.
hist_ndens = 1
Expand Down
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
@@ -1,5 +1,5 @@
!finidat = '$DIN_LOC_ROOT/lnd/clm2/initdata_map/iclm45fates-finit-s1.4.0-a3.0.0-f45.clm2.r.0111-01-01-00000.nc'
hist_mfilt = 365
hist_mfilt = 1
hist_nhtfrq = -24
hist_empty_htapes = .false.
fates_spitfire_mode = 1
Expand Down
2 changes: 1 addition & 1 deletion cime_config/testdefs/testmods_dirs/clm/FatesColdDryDepSatPhen/user_nl_clm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

hist_mfilt = 365
hist_mfilt = 1
hist_nhtfrq = -24

2 changes: 1 addition & 1 deletion cime_config/testdefs/testmods_dirs/clm/FatesColdHydro/user_nl_clm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
hist_mfilt = 365
hist_mfilt = 1
hist_nhtfrq = -24
hist_empty_htapes = .true.
use_fates_planthydro= .true.
Expand Down
2 changes: 1 addition & 1 deletion cime_config/testdefs/testmods_dirs/clm/FatesColdMeganSatPhen/user_nl_clm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

hist_mfilt = 365
hist_mfilt = 1
hist_nhtfrq = -24

2 changes: 1 addition & 1 deletion cime_config/testdefs/testmods_dirs/clm/FatesColdSatPhen/user_nl_clm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

hist_mfilt = 365
hist_mfilt = 1
hist_nhtfrq = -24

1 change: 1 addition & 0 deletions cime_config/testdefs/testmods_dirs/clm/GddGen/user_nl_clm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ generate_crop_gdds = .true.
use_mxmat = .false.

! (h3) Daily outputs for GDD generation and figure-making
! Note that hist_mfilt ≠ 1 means that ERI tests will probably fail
hist_fincl4 = 'GDDACCUM', 'GDDHARV'
hist_nhtfrq(4) = -24
hist_mfilt(4) = 365
Expand Down
2 changes: 1 addition & 1 deletion cime_config/testdefs/testmods_dirs/clm/fire_emis/user_nl_clm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
! Set maxpatch_glc with GLC_NEC option
!----------------------------------------------------------------------------------

hist_mfilt = 1,30
hist_mfilt = 1,1
hist_nhtfrq = 0,-24
hist_avgflag_pertape = 'A','A'
hist_fincl1 = 'M_LEAFC_TO_FIRE','M_LEAFC_STORAGE_TO_FIRE','M_LEAFC_XFER_TO_FIRE','M_LIVESTEMC_TO_FIRE',
Expand Down
2 changes: 1 addition & 1 deletion cime_config/testdefs/testmods_dirs/clm/glcMEC_long/user_nl_clm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
hist_nhtfrq =0,0
hist_mfilt = 1,12
hist_mfilt = 1,1
2 changes: 1 addition & 1 deletion src/main/clm_initializeMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -738,7 +738,7 @@ subroutine initialize2(ni,nj, currtime)
deallocate(wt_nat_patch)

! Initialise the fates model state structure
if ( use_fates .and. .not.is_restart() .and. finidat == ' ') then
if ( use_fates .and. .not. (is_restart() .or. nsrest .eq. nsrBranch) .and. finidat == ' ') then
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@samsrabin I was expecting the top part of this logical block to also exclude hybrid runs along with branch runs. Is a hybrid run equivalent to is_restart()=.true. ?
For future work I feel like we should clean some of this logic up, I cobbled a lot of this together many years ago when I did not have a good sense of restart options. But my take is that our decision making on how to restart fates (ie cold or from pre-existing vegetation structure in a restart file) really comes down to if it is a startup, branch or hybrid. The finidat string is less straight forward to use here in decide what part of the initialization sequence to use. My understanding is that the finidat should have a meaningful file path only in the latter two scenarios (branch and hybrid), so its better to use the switches that are the root of deciding these things rather variables like finidat that are "downstream" of them. Does that make sense? Again, I'd like to make an issue of this and flag it for future work and not complicate this PR.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do know that is_restart() returns true in hybrid runs, but I don't know if they're fully equivalent. As for the rest of it, since you think that work makes sense to do somewhere else, would you mind making an issue with your thoughts and then resolving this conversation?

! If fates is using satellite phenology mode, make sure to call the SatellitePhenology
! procedure prior to init_coldstart which will eventually call leaf_area_profile
if ( use_fates_sp ) then
Expand Down
3 changes: 2 additions & 1 deletion src/utils/clmfates_interfaceMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ module CLMFatesInterfaceMod
use clm_varctl , only : use_nitrif_denitrif
use clm_varctl , only : use_lch4
use clm_varctl , only : fates_history_dimlevel
use clm_varctl , only : nsrest, nsrBranch
use clm_varcon , only : tfrz
use clm_varcon , only : spval
use clm_varcon , only : denice
Expand Down Expand Up @@ -469,7 +470,7 @@ subroutine CLMFatesGlobals2()
! This has no variable on the FATES side yet (RGK)
!call set_fates_ctrlparms('sf_anthro_suppression_def',ival=anthro_suppression)

if(is_restart()) then
if(is_restart() .or. nsrest .eq. nsrBranch) then
pass_is_restart = 1
else
pass_is_restart = 0
Expand Down