add use_fates_potentialveg to use_fates_luh check

glemieux · May 5, 2024 · d8178e4 · d8178e4
1 parent a21181f
commit d8178e4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/bld/CLMBuildNamelist.pm b/bld/CLMBuildNamelist.pm
@@ -4377,9 +4377,11 @@ sub setup_logic_fates {
                       'use_fates_sp'=>$nl_flags->{'use_fates_sp'} );
         }
 
+ 	add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'use_fates_potentialveg', 'use_fates'=>$nl_flags->{'use_fates'});
  	add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'use_fates_lupft', 'use_fates'=>$nl_flags->{'use_fates'});
  	add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'use_fates_luh', 'use_fates'=>$nl_flags->{'use_fates'},
                       'use_fates_lupft'=>$nl->get_value('use_fates_lupft'), 
+                      'use_fates_potentialveg'=>$nl->get_value('use_fates_potentialveg'), 
                       'fates_harvest_mode'=>$nl->get_value('fates_harvest_mode') );
  	add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'use_fates_nocomp', 'use_fates'=>$nl_flags->{'use_fates'},
                       'use_fates_lupft'=>$nl->get_value('use_fates_lupft'),
@@ -4466,7 +4468,7 @@ sub setup_logic_fates {
            }
         }
         # check that fates landuse is on and harvest mode is off when potential veg switch is true
-        my $var = "use_potentialveg";
+        my $var = "use_fates_potentialveg";
         if ( defined($nl->get_value($var))  ) {
           if ( &value_is_true($nl->get_value($var)) ) {
             if ( ! &value_is_true($nl->get_value('use_fates_luh')) ) {

diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml
@@ -2769,10 +2769,11 @@ use_crop=".true.">lnd/clm2/surfdata_map/ctsm5.1.dev052/landuse.timeseries_mpasa1
 <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="3">.true.</use_fates_luh>
-<use_fates_luh                 use_fates=".true." fates_harvest_mode="4">.true.</use_fates_luh>
+<use_fates_luh                 use_fates=".true." fates_harvest_mode="3"  >.true.</use_fates_luh>
+<use_fates_luh                 use_fates=".true." fates_harvest_mode="4"  >.true.</use_fates_luh>
 <use_fates_luh                 use_fates=".true." use_fates_lupft=".true.">.true.</use_fates_luh>
-<use_fates_luh                 use_fates=".true."                         >.false.</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>
 <fates_parteh_mode             use_fates=".true.">1</fates_parteh_mode>
 <fates_seeddisp_cadence        use_fates=".true.">0</fates_seeddisp_cadence>
 <use_fates_nocomp              use_fates=".true." use_fates_sp=".true."   >.true.</use_fates_nocomp>