Merge pull request #3272 from slevis-lmwg/no_reseed_on_branch

Throw error if reseed_dead_plants = .true. in a branch simulation

Author: slevis-lmwg

bld/CLMBuildNamelist.pm

@@ -4478,6 +4478,10 @@ sub setup_logic_cngeneral {
                   "(eg. don't use these options with SP mode).");
     }
   }
+  if ( &value_is_true($nl->get_value('reseed_dead_plants')) &&
+       &remove_leading_and_trailing_quotes($nl_flags->{'clm_start_type'}) eq "branch") {
+      $log->fatal_error("reseed_dead_plants MUST be .false. in a branch run");
+  }
 }
 
 #-------------------------------------------------------------------------------

bld/unit_testers/build-namelist_test.pl

@@ -678,6 +678,10 @@ sub cat_and_create_namelistinfile {
                                      namelst=>"soil_decomp_method='None'",
                                      phys=>"clm5_0",
                                    },
+     "reseed with branch"        =>{ options=>"-clm_start_type branch -envxml_dir .",
+                                     namelst=>"reseed_dead_plants=.true.",
+                                     phys=>"clm6_0",
+                                   },
      "reseed without CN"         =>{ options=>" -envxml_dir . -bgc sp",
                                      namelst=>"reseed_dead_plants=.true.",
                                      phys=>"clm5_0",