From d51246e76a28ef7503cfc4c6146767ee4cf78572 Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Thu, 6 Feb 2025 08:54:08 -0700 Subject: [PATCH 1/5] Avoid pass_is_restart=1 on branch runs. --- src/utils/clmfates_interfaceMod.F90 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/utils/clmfates_interfaceMod.F90 b/src/utils/clmfates_interfaceMod.F90 index 269189d1b7..5b31cbbe88 100644 --- a/src/utils/clmfates_interfaceMod.F90 +++ b/src/utils/clmfates_interfaceMod.F90 @@ -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 @@ -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 From 9643c97023d52bc540e2321b1d040ffd83f9f838 Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Thu, 6 Feb 2025 09:06:41 -0700 Subject: [PATCH 2/5] Don't call clm_fates%init_coldstart for branch runs. --- src/main/clm_initializeMod.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/clm_initializeMod.F90 b/src/main/clm_initializeMod.F90 index 46353539ce..e3e7e6ab0b 100644 --- a/src/main/clm_initializeMod.F90 +++ b/src/main/clm_initializeMod.F90 @@ -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 ! 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 From c0561fd1c1837e96e159f13b7fbe905fb436ba1a Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Thu, 6 Feb 2025 11:42:21 -0700 Subject: [PATCH 3/5] In Fates* testmods, only use hist_mfilt = 1. This ensures matching filenames in both parts of ERI tests. --- cime_config/testdefs/testmods_dirs/clm/Fates/user_nl_clm | 2 +- .../testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm | 2 +- .../testmods_dirs/clm/FatesColdDryDepSatPhen/user_nl_clm | 2 +- .../testdefs/testmods_dirs/clm/FatesColdHydro/user_nl_clm | 2 +- .../testmods_dirs/clm/FatesColdMeganSatPhen/user_nl_clm | 2 +- .../testdefs/testmods_dirs/clm/FatesColdSatPhen/user_nl_clm | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cime_config/testdefs/testmods_dirs/clm/Fates/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/Fates/user_nl_clm index 8bd9f01335..374b17b302 100644 --- a/cime_config/testdefs/testmods_dirs/clm/Fates/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/Fates/user_nl_clm @@ -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 diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm index 92434df000..4ff4d3904c 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm @@ -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 diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDryDepSatPhen/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdDryDepSatPhen/user_nl_clm index 3749fd1d61..3bcfdcdf3e 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdDryDepSatPhen/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdDryDepSatPhen/user_nl_clm @@ -1,4 +1,4 @@ -hist_mfilt = 365 +hist_mfilt = 1 hist_nhtfrq = -24 diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdHydro/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdHydro/user_nl_clm index f0bdb388eb..c37267f615 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdHydro/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdHydro/user_nl_clm @@ -1,4 +1,4 @@ -hist_mfilt = 365 +hist_mfilt = 1 hist_nhtfrq = -24 hist_empty_htapes = .true. use_fates_planthydro= .true. diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdMeganSatPhen/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdMeganSatPhen/user_nl_clm index 3749fd1d61..3bcfdcdf3e 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdMeganSatPhen/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdMeganSatPhen/user_nl_clm @@ -1,4 +1,4 @@ -hist_mfilt = 365 +hist_mfilt = 1 hist_nhtfrq = -24 diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdSatPhen/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdSatPhen/user_nl_clm index 3749fd1d61..3bcfdcdf3e 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdSatPhen/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdSatPhen/user_nl_clm @@ -1,4 +1,4 @@ -hist_mfilt = 365 +hist_mfilt = 1 hist_nhtfrq = -24 From 1d70d193c5192c58aa75fa31803a1172aa8c4b68 Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Thu, 6 Feb 2025 12:07:04 -0700 Subject: [PATCH 4/5] Change hist_mfilt to avoid ERI problems w/ two non-FATES testmods. --- cime_config/testdefs/testmods_dirs/clm/GddGen/user_nl_clm | 1 + cime_config/testdefs/testmods_dirs/clm/fire_emis/user_nl_clm | 2 +- cime_config/testdefs/testmods_dirs/clm/glcMEC_long/user_nl_clm | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cime_config/testdefs/testmods_dirs/clm/GddGen/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/GddGen/user_nl_clm index cfde517fd9..00e045888c 100644 --- a/cime_config/testdefs/testmods_dirs/clm/GddGen/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/GddGen/user_nl_clm @@ -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 diff --git a/cime_config/testdefs/testmods_dirs/clm/fire_emis/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/fire_emis/user_nl_clm index 027b17630e..294c227b00 100644 --- a/cime_config/testdefs/testmods_dirs/clm/fire_emis/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/fire_emis/user_nl_clm @@ -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', diff --git a/cime_config/testdefs/testmods_dirs/clm/glcMEC_long/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/glcMEC_long/user_nl_clm index dd99ceba50..98e58369ec 100644 --- a/cime_config/testdefs/testmods_dirs/clm/glcMEC_long/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/glcMEC_long/user_nl_clm @@ -1,2 +1,2 @@ hist_nhtfrq =0,0 - hist_mfilt = 1,12 + hist_mfilt = 1,1 From 70e20f26a3a0050a0b0b771f8ef6d638d46689bd Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Thu, 13 Feb 2025 13:04:27 -0700 Subject: [PATCH 5/5] Change two FATES ERS tests to ERI. --- cime_config/testdefs/testlist_clm.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index 2845bf8d7c..eceafdfaea 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -2805,7 +2805,7 @@ - + @@ -3247,7 +3247,7 @@ - +