make fates compatable with -fire_emis

NorESMhub · Mar 15, 2024 · 50d6784 · 50d6784
1 parent be3edce
commit 50d6784
Showing 1 changed file with 5 additions and 5 deletions.
diff --git 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')) ||