Revert "Merge branch 'thorntonpe/lnd/IM4' into next (PR #6433)"

This reverts commit 15b89e4, reversing
changes made to bfcb4ee.

cime_config/tests.py

@@ -76,6 +76,7 @@
             )
         },
 
+
     "e3sm_land_developer" : {
         "share" : True,
         "time"  : "0:45:00",
@@ -94,8 +95,6 @@
             "SMS.r05_r05.IELM.elm-topounit",
             "ERS.ELM_USRDAT.I1850ELM.elm-usrdat",
             "ERS.r05_r05.IELM.elm-lnd_rof_2way",
-            "ERS.ELM_USRDAT.I1850CNPRDCTCBC.elm-usrpft_default_I1850CNPRDCTCBC",
-            "ERS.ELM_USRDAT.I1850CNPRDCTCBC.elm-usrpft_codetest_I1850CNPRDCTCBC",
             "ERS.r05_r05.IELM.elm-V2_ELM_MOSART_features",
             "ERS.ELM_USRDAT.IELM.elm-surface_water_dynamics"
             )

components/elm/bld/ELMBuildNamelist.pm

@@ -1552,19 +1552,13 @@ sub setup_cmdl_maxpft {
   $nl_flags->{'maxpft'} = $val;
 
   if ( ($nl_flags->{'bgc_mode'} ne "sp") && ($nl_flags->{'maxpft'} != $maxpatchpft{$nl_flags->{'use_crop'}}) ) {
-    if ($opts->{$var} eq "default") {
-      fatal_error("** For CN or BGC mode you MUST set max patch PFT $val to $maxpatchpft{$nl_flags->{'use_crop'}}\n" .
-      "**\n" .
-      "** When the crop model is on then it must be set to $maxpatchpft{'crop'} otherwise to $maxpatchpft{'nocrop'}\n" .
-      "** Set the bgc mode, crop and maxpft by the following means from highest to lowest precedence:\n" .
-      "** * by the command-line options -bgc, -crop and -maxpft\n" .
-      "** * by a default configuration file, specified by -defaults\n" .
-      "**\n");
-    } else {
-         message("running with maxpft NOT equal to $maxpatchpft{$nl_flags->{'use_crop'}} is " .
-              "NOT validated / scientifically supported.\n");
-
-      }
+    fatal_error("** For CN or BGC mode you MUST set max patch PFT's to $maxpatchpft{$nl_flags->{'use_crop'}}\n" .
+    "**\n" .
+    "** When the crop model is on then it must be set to $maxpatchpft{'crop'} otherwise to $maxpatchpft{'nocrop'}\n" .
+    "** Set the bgc mode, crop and maxpft by the following means from highest to lowest precedence:\n" .
+    "** * by the command-line options -bgc, -crop and -maxpft\n" .
+    "** * by a default configuration file, specified by -defaults\n" .
+    "**\n");
   }
   if ( $nl_flags->{'maxpft'} > $maxpatchpft{$nl_flags->{'use_crop'}} ) {
     fatal_error("** Max patch PFT's can NOT exceed $maxpatchpft{$nl_flags->{'use_crop'}}\n" .