Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 10 additions & 3 deletions bld/CLMBuildNamelist.pm
Original file line number Diff line number Diff line change
Expand Up @@ -1245,7 +1245,14 @@ sub setup_cmdl_spinup {
}
}
$log->verbose_message("CLM accelerated spinup mode is $val");
if ( &value_is_true($nl_flags->{'use_cn'}) ) {

# is this a BGC-capable mode that supports spinup?
# spinup is valid if using CN, or using FATES in non-SP mode.
my $use_fates_spinup_ok = &value_is_true($nl_flags->{'use_fates'}) &&
! &value_is_true($nl_flags->{'use_fates_sp'});
Comment thread
adrifoster marked this conversation as resolved.
my $bgc_spinup_capable = &value_is_true($nl_flags->{'use_cn'}) || $use_fates_spinup_ok;

if ( $bgc_spinup_capable ) {
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition,
$defaults, $nl, "spinup_state", clm_accelerated_spinup=>$nl_flags->{'clm_accelerated_spinup'},
use_cn=>$nl_flags->{'use_cn'}, use_fates=>$nl_flags->{'use_fates'},
Expand All @@ -1262,8 +1269,8 @@ sub setup_cmdl_spinup {
} else {
$nl_flags->{'bgc_spinup'} = "off";
}
# For AD spinup mode by default reseed dead plants
if ( $nl_flags->{$var} ne "off" ) {
# For BGC and AD spinup mode by default reseed dead plants
if ( $nl_flags->{$var} ne "off" && &value_is_true($nl_flags->{'use_cn'}) ) {
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition,
$defaults, $nl, "reseed_dead_plants", clm_accelerated_spinup=>$nl_flags->{$var},
use_cn=>$nl_flags->{'use_cn'} );
Expand Down
4 changes: 2 additions & 2 deletions bld/namelist_files/namelist_defaults_ctsm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,15 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
<hist_fincl1 clm_accelerated_spinup="on" use_cn=".true."
>'TOTECOSYSC','TOTECOSYSN','TOTSOMC','TOTSOMN','TOTVEGC','TOTVEGN','TLAI','GPP','CPOOL','NPP','TWS','H2OSNO'</hist_fincl1>
<hist_fincl1 clm_accelerated_spinup="on" use_fates=".true."
>'TOTSOMC','TOTSOMN','TLAI','GPP','NPP','TWS','H2OSNO'</hist_fincl1>
>'TOTSOMC','TOTSOMN','FATES_LAI','FATES_GPP','FATES_NPP','FATES_VEGC','TWS','H2OSNO'</hist_fincl1>
<hist_fincl1 clm_accelerated_spinup="on" use_cn=".false."
>'TLAI','TWS','H2OSNO'</hist_fincl1>
<hist_fincl1 clm_accelerated_spinup="sasu" use_cn=".true." use_cndv=".true."
>'TOTECOSYSC','TOTECOSYSN','TOTSOMC','TOTSOMN','TOTVEGC','TOTVEGN','TLAI','GPP','NPP','TWS','TSAI','HTOP','HBOT','H2OSNO'</hist_fincl1>
<hist_fincl1 clm_accelerated_spinup="sasu" use_cn=".true."
>'TOTECOSYSC','TOTECOSYSN','TOTSOMC','TOTSOMN','TOTVEGC','TOTVEGN','TLAI','GPP','CPOOL','NPP','TWS','H2OSNO'</hist_fincl1>
<hist_fincl1 clm_accelerated_spinup="sasu" use_fates=".true."
>'TOTSOMC','TOTSOMN','TLAI','GPP','NPP','TWS','H2OSNO'</hist_fincl1>
>'TOTSOMC','TOTSOMN','FATES_LAI','FATES_GPP','FATES_NPP','FATES_VEGC','TWS','H2OSNO'</hist_fincl1>
<hist_nhtfrq clm_accelerated_spinup="on" >-8760</hist_nhtfrq>
<hist_nhtfrq clm_accelerated_spinup="sasu">-8760</hist_nhtfrq>
<hist_mfilt clm_accelerated_spinup="on" >20</hist_mfilt>
Expand Down
2 changes: 1 addition & 1 deletion cime_config/usermods_dirs/clm/fates_sp/user_nl_clm
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ use_lch4 = .false.
fates_spitfire_mode = 0
use_fates_fixed_biogeog = .true.
use_fates_nocomp = .true.
hist_ndens = 1
hist_ndens = 2
Loading