From 50d67847757098c88800e90a41a301287b92496f Mon Sep 17 00:00:00 2001 From: mvdebolskiy Date: Fri, 15 Mar 2024 16:02:45 +0100 Subject: [PATCH] make fates compatable with -fire_emis --- bld/CLMBuildNamelist.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bld/CLMBuildNamelist.pm b/bld/CLMBuildNamelist.pm index dae7b5f7f0..b4550f99c4 100755 --- a/bld/CLMBuildNamelist.pm +++ b/bld/CLMBuildNamelist.pm @@ -3918,11 +3918,11 @@ sub setup_logic_fire_emis { if ($opts->{'fire_emis'} ) { if ( &value_is_true( $nl_flags->{'use_fates'} ) ) { - $log->warning("Fire emission can NOT be on when FATES is also on.\n" . - " DON'T use the '-fire_emis' option when '-bgc fates' is activated"); - } - add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'fire_emis_factors_file'); - add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'fire_emis_specifier'); + $log->warning( "Fire emission factor file will NOT be used when FATES is on.\n" ); + } else { + add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'fire_emis_factors_file'); + } + add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'fire_emis_specifier'); } else { if ( defined($nl->get_value('fire_emis_elevated')) || defined($nl->get_value('fire_emis_factors_file')) ||