Move lheatstrg with rest of lsm-dependent vars

The lheatstrg setting is added to the rest of the variables set
depending on the lsm type. Now overridden settings in config.fcst
are removed.

Refs: NOAA-EMC#416

parm/config/config.fcst

@@ -113,16 +113,6 @@ export isatmedmf=1
 tbf=""
 if [ $satmedmf = ".true." ]; then tbf="_satmedmf" ; fi
 
-# Land surface model. (2--NoahMP, landice=F); (1--Noah, landice=T)
-export lsm=1
-if [ $lsm -eq 2 ]; then
-    export lheatstrg=".false."
-    export landice=".false."
-else
-    export lheatstrg=".false."
-    export landice=".true."
-fi
-
 # Radiation options 
 export IAER=1011    ;#spectral band mapping method for aerosol optical properties
 export iovr_lw=3    ;#de-correlation length cloud overlap method (Barker, 2008) 

ush/forecast_postdet.sh

@@ -203,6 +203,7 @@ EOF
   # Scan suite file to determine whether it uses Noah-MP
   if [ $(grep noahmpdrv ${_suite_file} | wc -l ) -gt 0 ]; then
     lsm="2"
+    lheatstrg=".true."
     landice=".false."
     iopt_dveg=${iopt_dveg:-"4"}
     iopt_crs=${iopt_crs:-"2"}
@@ -218,6 +219,7 @@ EOF
     iopt_stc=${iopt_stc:-"3"}
   else
     lsm="1"
+    lheatstrg=".false."
     landice=".true."
     iopt_dveg=${iopt_dveg:-"1"}
     iopt_crs=${iopt_crs:-"1"}