Skip to content

Commit 79b3903

Browse files
committed
fix namelist build and add a test
1 parent d0e59b9 commit 79b3903

4 files changed

Lines changed: 12 additions & 2 deletions

File tree

bld/CLMBuildNamelist.pm

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4024,10 +4024,12 @@ sub setup_logic_dry_deposition {
40244024
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'drydep_list');
40254025
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'dep_data_file');
40264026
}
4027-
if ( &value_is_true( $nl_flags->{'use_fates'}) && not &value_is_true( $nl_flags->{'use_fates_sp'}) ) {
4027+
# fates-sp will set use_fates_nocomp in the setup logic for fates earlier
4028+
if ( &value_is_true( $nl_flags->{'use_fates'}) &&
4029+
not &value_is_true($nl->get_value('use_fates_nocomp'))) {
40284030
foreach my $var ( @list ) {
40294031
if ( defined($nl->get_value($var)) ) {
4030-
$log->warning("DryDeposition $var is being set and can NOT be on when FATES is also on unless FATES-SP mode is on.\n" .
4032+
$log->warning("DryDeposition $var is being set and can NOT be on when FATES is also on unless FATES-NOCOMP mode is on.\n" .
40314033
" Use the '--no-drydep' option when '-bgc fates' is activated");
40324034
}
40334035
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../FatesColdNoComp
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
./xmlchange CLM_BLDNML_OPTS='--drydep' --append
2+
# The following would be required if you want to run with DryDep and FATES without Fates-SP mode
3+
#./xmlchange CLM_BLDNML_OPTS="--ignore_warnings" --append
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
2+
hist_mfilt = 365
3+
hist_nhtfrq = -24
4+

0 commit comments

Comments
 (0)