reinstate default settings for various fates modes

E3SM-Project · Jul 13, 2024 · 6d21ce5 · 6d21ce5
1 parent 1b0772c
commit 6d21ce5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/components/elm/bld/ELMBuildNamelist.pm b/components/elm/bld/ELMBuildNamelist.pm
@@ -3545,7 +3545,7 @@ sub setup_logic_fates {
        if ( $mode eq "luhdata_area" || $mode  eq "luhdata_mass" ) {
           # Make sure that use_fates_luh is true when using raw fates luh2 harvest data
           if ( ! &value_is_true($nl->get_value('use_fates_luh')) ) {
-            fatal_error("use_fates_luh is required to be true when $var is greater than 2" );
+            fatal_error("use_fates_luh is required to be true when $var is luhdata_mass or luhdata_area" );
           }
        } elsif ( $mode  eq 'landuse_timeseries' ) {
           # Check to make sure that the user set the flanduse_timeseries file

diff --git a/components/elm/bld/namelist_files/namelist_defaults.xml b/components/elm/bld/namelist_files/namelist_defaults.xml
@@ -2195,11 +2195,17 @@ this mask will have smb calculated over the entire global land surface
 <use_fates_sp                  use_fates=".true.">.false.</use_fates_sp>
 <use_fates_lupft               use_fates=".true.">.false.</use_fates_lupft>
 <use_fates_potentialveg        use_fates=".true.">.false.</use_fates_potentialveg>
+<use_fates_luh                 use_fates=".true." fates_harvest_mode="luhdata_area"  >.true.</use_fates_luh>
+<use_fates_luh                 use_fates=".true." fates_harvest_mode="luhdata_mass"  >.true.</use_fates_luh>
+<use_fates_luh                 use_fates=".true." use_fates_lupft=".true.">.true.</use_fates_luh>
+<use_fates_luh                 use_fates=".true." use_fates_potentialveg=".true.">.true.</use_fates_luh>
 <use_fates_luh                 use_fates=".true."                                  >.false.</use_fates_luh>
 <use_fates_inventory_init      use_fates=".true.">.false.</use_fates_inventory_init>
 <use_fates_nocomp              use_fates=".true." use_fates_sp=".true.">.true.</use_fates_nocomp>
+<use_fates_nocomp              use_fates=".true." use_fates_lupft=".true.">.true.</use_fates_nocomp>
 <use_fates_nocomp              use_fates=".true."                      >.false.</use_fates_nocomp>
 <use_fates_fixed_biogeog       use_fates=".true." use_fates_sp=".true.">.true.</use_fates_fixed_biogeog>
+<use_fates_fixed_biogeog       use_fates=".true." use_fates_lupft=".true.">.true.</use_fates_fixed_biogeog>
 <use_fates_fixed_biogeog       use_fates=".true."                      >.false.</use_fates_fixed_biogeog>
 <use_vertsoilc                 bgc_mode="fates"  >.true.</use_vertsoilc>
 <use_century_decomp            bgc_mode="fates"  >.true.</use_century_decomp>