diff --git a/VERSION b/VERSION
index 6a7144d30..6b48f258c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-10.0.3
+10.0.4
diff --git a/parm/fv3lam.xml b/parm/fv3lam.xml
index 8ca9a9e75..33950fbbd 100755
--- a/parm/fv3lam.xml
+++ b/parm/fv3lam.xml
@@ -152,7 +152,7 @@
        <param>
        <shortname>HGT_ON_ISOBARIC_SFC</shortname>
        <pname>HGT</pname>
-       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
+       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.</level>
         <scale>6.0</scale>
        </param>
@@ -160,7 +160,7 @@
        <param>
        <shortname>TMP_ON_ISOBARIC_SFC</shortname>
        <pname>TMP</pname>
-       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
+       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.</level>
        <scale>3.0</scale>
        </param>
@@ -168,7 +168,7 @@
        <param>
        <shortname>DPT_ON_ISOBARIC_SFC</shortname>
        <pname>DPT</pname>
-       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
+       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.</level>
         <scale>5.0</scale>
        </param>
@@ -176,7 +176,7 @@
        <param>
        <shortname>SPFH_ON_ISOBARIC_SFC</shortname>
        <pname>SPFH</pname>
-       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
+       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.</level>
        <scale>4.0</scale>
        </param>
@@ -184,7 +184,7 @@
        <param>
        <shortname>RH_ON_ISOBARIC_SFC</shortname>
        <pname>RH</pname>
-       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
+       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.</level>
        <scale>2.0</scale>
        </param>
@@ -200,7 +200,7 @@
        <param>
        <shortname>UGRD_ON_ISOBARIC_SFC</shortname>
        <pname>UGRD</pname>
-       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
+       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.</level>
        <scale>4.0</scale>
        </param>
@@ -208,7 +208,7 @@
        <param>
        <shortname>VGRD_ON_ISOBARIC_SFC</shortname>
        <pname>VGRD</pname>
-       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
+       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.</level>
        <scale>4.0</scale>
        </param>
@@ -216,7 +216,7 @@
        <param>
        <shortname>VVEL_ON_ISOBARIC_SFC</shortname>
        <pname>VVEL</pname>
-       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
+       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.</level>
         <scale>5.0</scale>
        </param>
@@ -224,7 +224,7 @@
        <param>
        <shortname>DZDT_ON_ISOBARIC_SFC</shortname>
        <pname>DZDT</pname>
-       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
+       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.</level>
         <scale>-5.0</scale>
        </param>
@@ -246,7 +246,7 @@
        <param>
        <shortname>TKE_ON_ISOBARIC_SFC</shortname>
        <pname>TKE</pname>
-       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
+       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.</level>
        <scale>3.0</scale>
        </param>
@@ -254,7 +254,7 @@
        <param>
        <shortname>ICMR_ON_ISOBARIC_SFC</shortname>
        <pname>ICMR</pname>
-       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
+       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.</level>
         <scale>6.0</scale>
        </param>
@@ -262,7 +262,7 @@
        <param>
        <shortname>CLWMR_ON_ISOBARIC_SFC</shortname>
        <pname>CLWMR</pname>
-       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
+       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.</level>
        <scale>4.0</scale>
        </param>
@@ -270,7 +270,7 @@
        <param>
        <shortname>RWMR_ON_ISOBARIC_SFC</shortname>
        <pname>RWMR</pname>
-       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
+       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.</level>
        <scale>6.0</scale>
        </param>
@@ -278,7 +278,7 @@
        <param>
        <shortname>GRLE_ON_ISOBARIC_SFC</shortname>
        <pname>GRLE</pname>
-       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000.
+       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000.
 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.</level>
        <scale>3.0</scale>
        </param>
@@ -286,7 +286,7 @@
        <param>
        <shortname>SNMR_ON_ISOBARIC_SFC</shortname>
        <pname>SNMR</pname>
-       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
+       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.</level>
        <scale>6.0</scale>
        </param>
@@ -295,7 +295,7 @@
        <shortname>RIME_ON_ISOBARIC_SFC</shortname>
        <pname>RIME</pname>
        <table_info>NCEP</table_info>
-       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
+       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.</level>
        <scale>3.0</scale>
        </param>
diff --git a/parm/makefile b/parm/makefile
index 628844da7..17bfaff3b 100644
--- a/parm/makefile
+++ b/parm/makefile
@@ -45,7 +45,7 @@ GEFSANLCTRLFILENAME     = postcntrl_gefs_anl.xml
 GEFSCTRLF00FILENAME     = postcntrl_gefs_f00.xml
 FV3SARAVAILXMLFILENAME  = fv3lam_post_avblflds.xml
 FV3SARCTRLFILENAME      = fv3lam.xml
-HAFSCTRLFILENAME        = hafs.xml
+HAFSCTRLFILENAME        = postcntrl_hafs.xml
 GFSTWOCTRLFILENAME      = postcntrl_gfs_two.xml
 GFSTWOF00CTRLFILENAME   = postcntrl_gfs_f00_two.xml
 HRRRAVAILXMLFILENAME    = post_avblflds_raphrrr.xml
diff --git a/parm/hafs.xml b/parm/postcntrl_hafs.xml
similarity index 81%
rename from parm/hafs.xml
rename to parm/postcntrl_hafs.xml
index 47986ed21..be9041709 100755
--- a/parm/hafs.xml
+++ b/parm/postcntrl_hafs.xml
@@ -13,7 +13,7 @@
     <gen_proc_type>fcst</gen_proc_type>
     <time_range_unit>hour</time_range_unit>
     <orig_center>nws_ncep</orig_center>
-    <gen_proc>hur_weather_res_and_fcst</gen_proc>
+    <gen_proc>hafs</gen_proc>
     <packing_method>complex_packing_spatial_diff</packing_method>
     <order_of_sptdiff>2nd_ord_sptdiff</order_of_sptdiff>
     <field_datatype>fltng_pnt</field_datatype>
@@ -22,39 +22,39 @@
        <param>
        <shortname>HGT_ON_ISOBARIC_SFC</shortname>
        <pname>HGT</pname>
-       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
+       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.</level>
-        <scale>6.0</scale>
+       <scale>6.0</scale>
        </param>
 
        <param>
        <shortname>TMP_ON_ISOBARIC_SFC</shortname>
        <pname>TMP</pname>
-       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
+       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.</level>
-       <scale>3.0</scale>
+       <scale>4.0</scale>
        </param>
 
        <param>
        <shortname>SPFH_ON_ISOBARIC_SFC</shortname>
        <pname>SPFH</pname>
-       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
+       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.</level>
-       <scale>4.0</scale>
+       <scale>7.0</scale>
        </param>
 
        <param>
        <shortname>RH_ON_ISOBARIC_SFC</shortname>
        <pname>RH</pname>
-       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
+       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.</level>
-       <scale>2.0</scale>
+       <scale>3.0</scale>
        </param>
 
        <param>
        <shortname>UGRD_ON_ISOBARIC_SFC</shortname>
        <pname>UGRD</pname>
-       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
+       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.</level>
        <scale>4.0</scale>
        </param>
@@ -62,31 +62,31 @@
        <param>
        <shortname>VGRD_ON_ISOBARIC_SFC</shortname>
        <pname>VGRD</pname>
-       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
+       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.</level>
        <scale>4.0</scale>
        </param>
 
        <param>
-       <shortname>VVEL_ON_ISOBARIC_SFC</shortname>
-       <pname>VVEL</pname>
-       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
+       <shortname>DZDT_ON_ISOBARIC_SFC</shortname>
+       <pname>DZDT</pname>
+       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.</level>
         <scale>5.0</scale>
        </param>
 
        <param>
-       <shortname>DZDT_ON_ISOBARIC_SFC</shortname>
-       <pname>DZDT</pname>
-       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
+       <shortname>VVEL_ON_ISOBARIC_SFC</shortname>
+       <pname>VVEL</pname>
+       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.</level>
-        <scale>-5.0</scale>
+        <scale>5.0</scale>
        </param>
 
        <param>
        <shortname>ABSV_ON_ISOBARIC_SFC</shortname>
        <pname>ABSV</pname>
-       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000.
+       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000.
 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.</level>
        <scale>4.0</scale>
        </param>
@@ -94,47 +94,55 @@
        <param>
        <shortname>TKE_ON_ISOBARIC_SFC</shortname>
        <pname>TKE</pname>
-       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
+       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.</level>
        <scale>3.0</scale>
        </param>
 
        <param>
-       <shortname>ICMR_ON_ISOBARIC_SFC</shortname>
-       <pname>ICMR</pname>
-       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
+       <shortname>CLWMR_ON_ISOBARIC_SFC</shortname>
+       <pname>CLWMR</pname>
+       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.</level>
-        <scale>6.0</scale>
+       <scale>6.0</scale>
        </param>
 
        <param>
-       <shortname>CLWMR_ON_ISOBARIC_SFC</shortname>
-       <pname>CLWMR</pname>
-       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
+       <shortname>ICMR_ON_ISOBARIC_SFC</shortname>
+       <pname>ICMR</pname>
+       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.</level>
-       <scale>4.0</scale>
+        <scale>6.0</scale>
        </param>
 
        <param>
        <shortname>RWMR_ON_ISOBARIC_SFC</shortname>
        <pname>RWMR</pname>
-       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
+       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.</level>
-       <scale>3.0</scale>
+       <scale>6.0</scale>
        </param>
 
        <param>
        <shortname>SNMR_ON_ISOBARIC_SFC</shortname>
        <pname>SNMR</pname>
-       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
+       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.</level>
-       <scale>3.0</scale>
+       <scale>6.0</scale>
+       </param>
+
+       <param>
+       <shortname>GRLE_ON_ISOBARIC_SFC</shortname>
+       <pname>GRLE</pname>
+       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 
+47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.</level>
+       <scale>6.0</scale>
        </param>
 
        <param>
        <shortname>REFD_ON_ISOBARIC_SFC</shortname>
        <pname>REFD</pname>
-       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000.
+       <level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000.
 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.</level>
        <scale>4.0</scale>
        </param>
@@ -161,7 +169,7 @@
        <param>
        <shortname>SPFH_ON_SPEC_HGT_LVL_ABOVE_GRND_2m</shortname>
        <pname>SPFH</pname>
-       <scale>4.0</scale>
+       <scale>7.0</scale>
        </param>
 
        <param>
@@ -193,14 +201,14 @@
        <param>
        <shortname>GUST_ON_SURFACE</shortname>
        <pname>GUST</pname>
-       <scale>3.0</scale>
+       <scale>4.0</scale>
        </param>
 
        <param>
        <shortname>POT_ON_SPEC_HGT_LVL_ABOVE_GRND_10m</shortname>
        <pname>POT</pname>
        <level>10.</level>
-        <scale>5.0</scale>
+        <scale>4.0</scale>
        </param>
 
        <param>
@@ -218,7 +226,7 @@
        <param>
        <shortname>POT_ON_SURFACE</shortname>
        <pname>POT</pname>
-        <scale>5.0</scale>
+        <scale>4.0</scale>
        </param>
 
        <param>
@@ -244,7 +252,7 @@
        <shortname>SFEXC_ON_SURFACE</shortname>
        <pname>SFEXC</pname>
        <table_info>NCEP</table_info>
-       <scale>3.0</scale>
+       <scale>4.0</scale>
        </param>
 
        <param>
@@ -262,7 +270,7 @@
        <param>
        <shortname>PWAT_ON_ENTIRE_ATMOS_SINGLE_LYR</shortname>
        <pname>PWAT</pname>
-       <scale>3.0</scale>
+       <scale>6.0</scale>
        </param>
 
        <param>
@@ -287,19 +295,19 @@
        <param>
        <shortname>INST_PRATE_ON_SURFACE</shortname>
        <pname>PRATE</pname>
-       <scale>3.0</scale>
+       <scale>6.0</scale>
        </param>
 
        <param>
        <shortname>INST_TCDC_ON_ENTIRE_ATMOS</shortname>
        <pname>TCDC</pname>
-       <scale>3.0</scale>
+       <scale>4.0</scale>
        </param>
 
        <param>
        <shortname>AVE_TCDC_ON_ENTIRE_ATMOS</shortname>
        <pname>TCDC</pname>
-       <scale>3.0</scale>
+       <scale>4.0</scale>
        </param>
 
        <param>
@@ -313,56 +321,56 @@
        <shortname>INST_USWRF_ON_SURFACE</shortname>
        <pname>USWRF</pname>
        <table_info>NCEP</table_info>
-       <scale>4.0</scale>
+       <scale>6.0</scale>
        </param>
 
        <param>
        <shortname>INST_ULWRF_ON_SURFACE</shortname>
        <pname>ULWRF</pname>
        <table_info>NCEP</table_info>
-       <scale>4.0</scale>
+       <scale>6.0</scale>
        </param>
 
        <param>
        <shortname>AVE_DSWRF_ON_SURFACE</shortname>
        <pname>DSWRF</pname>
        <table_info>NCEP</table_info>
-       <scale>3.0</scale>
+       <scale>6.0</scale>
        </param>
 
        <param>
        <shortname>AVE_DLWRF_ON_SURFACE</shortname>
        <pname>DLWRF</pname>
        <table_info>NCEP</table_info>
-       <scale>3.0</scale>
+       <scale>4.0</scale>
        </param>
 
        <param>
        <shortname>AVE_USWRF_ON_SURFACE</shortname>
        <pname>USWRF</pname>
        <table_info>NCEP</table_info>
-       <scale>3.0</scale>
+       <scale>6.0</scale>
        </param>
 
        <param>
        <shortname>AVE_ULWRF_ON_SURFACE</shortname>
        <pname>ULWRF</pname>
        <table_info>NCEP</table_info>
-       <scale>3.0</scale>
+       <scale>4.0</scale>
        </param>
 
        <param>
        <shortname>AVE_USWRF_ON_TOP_OF_ATMOS</shortname>
        <pname>USWRF</pname>
        <table_info>NCEP</table_info>
-       <scale>3.0</scale>
+       <scale>6.0</scale>
        </param>
 
        <param>
        <shortname>AVE_ULWRF_ON_TOP_OF_ATMOS</shortname>
        <pname>ULWRF</pname>
        <table_info>NCEP</table_info>
-       <scale>3.0</scale>
+       <scale>4.0</scale>
        </param>
 
        <param>
@@ -375,14 +383,14 @@
        <param>
        <shortname>BRTMP_ON_TOP_OF_ATMOS</shortname>
        <pname>BRTMP</pname>
-       <scale>3.0</scale>
+       <scale>4.0</scale>
        </param>
 
        <param>
        <shortname>INST_DSWRF_ON_SURFACE</shortname>
        <pname>DSWRF</pname>
        <table_info>NCEP</table_info>
-       <scale>4.0</scale>
+       <scale>6.0</scale>
        </param>
 
        <param>
@@ -395,7 +403,7 @@
        <param>
        <shortname>SFCR_ON_SURFACE</shortname>
        <pname>SFCR</pname>
-        <scale>2.7</scale>
+        <scale>6.0</scale>
        </param>
 
        <param>
@@ -415,13 +423,13 @@
        <param>
        <shortname>UFLX_ON_SURFACE</shortname>
        <pname>UFLX</pname>
-       <scale>3.0</scale>
+       <scale>4.0</scale>
        </param>
 
        <param>
        <shortname>VFLX_ON_SURFACE</shortname>
        <pname>VFLX</pname>
-       <scale>3.0</scale>
+       <scale>4.0</scale>
        </param>
 
        <param>
@@ -477,7 +485,7 @@
        <param>
        <shortname>WTMP_ON_SURFACE</shortname>
        <pname>WTMP</pname>
-        <scale>5.0</scale>
+        <scale>4.0</scale>
        </param>
 
        <param>
@@ -495,13 +503,13 @@
        <param>
        <shortname>TMP_ON_TROPOPAUSE</shortname>
        <pname>TMP</pname>
-       <scale>3.0</scale>
+       <scale>4.0</scale>
        </param>
 
        <param>
        <shortname>POT_ON_TROPOPAUSE</shortname>
        <pname>POT</pname>
-        <scale>5.0</scale>
+        <scale>4.0</scale>
        </param>
 
        <param>
@@ -526,7 +534,7 @@
        <param>
        <shortname>TMP_ON_CLOUD_TOP</shortname>
        <pname>TMP</pname>
-        <scale>5.0</scale>
+        <scale>4.0</scale>
        </param>
 
        <param>
@@ -609,7 +617,7 @@
        <param>
        <shortname>MAX_PRATE_ON_SURFACE</shortname>
        <pname>PRATE</pname>
-       <scale>4.0</scale>
+       <scale>6.0</scale>
        </param>
 
     </paramset>
diff --git a/parm/postxconfig-NT-fv3lam.txt b/parm/postxconfig-NT-fv3lam.txt
index 0a906959a..50ab5a850 100644
--- a/parm/postxconfig-NT-fv3lam.txt
+++ b/parm/postxconfig-NT-fv3lam.txt
@@ -694,8 +694,8 @@ HGT
 isobaric_sfc
 0
 ?
-46
-200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
+45
+200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
 ?
 0
 ?
@@ -731,8 +731,8 @@ TMP
 isobaric_sfc
 0
 ?
-46
-200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
+45
+200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
 ?
 0
 ?
@@ -768,8 +768,8 @@ DPT
 isobaric_sfc
 0
 ?
-46
-200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
+45
+200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
 ?
 0
 ?
@@ -805,8 +805,8 @@ SPFH
 isobaric_sfc
 0
 ?
-46
-200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
+45
+200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
 ?
 0
 ?
@@ -842,8 +842,8 @@ RH
 isobaric_sfc
 0
 ?
-46
-200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
+45
+200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
 ?
 0
 ?
@@ -916,8 +916,8 @@ UGRD
 isobaric_sfc
 0
 ?
-46
-200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
+45
+200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
 ?
 0
 ?
@@ -953,8 +953,8 @@ VGRD
 isobaric_sfc
 0
 ?
-46
-200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
+45
+200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
 ?
 0
 ?
@@ -990,8 +990,8 @@ VVEL
 isobaric_sfc
 0
 ?
-46
-200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
+45
+200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
 ?
 0
 ?
@@ -1027,8 +1027,8 @@ DZDT
 isobaric_sfc
 0
 ?
-46
-200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
+45
+200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
 ?
 0
 ?
@@ -1138,8 +1138,8 @@ TKE
 isobaric_sfc
 0
 ?
-46
-200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
+45
+200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
 ?
 0
 ?
@@ -1175,8 +1175,8 @@ ICMR
 isobaric_sfc
 0
 ?
-46
-200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
+45
+200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
 ?
 0
 ?
@@ -1212,8 +1212,8 @@ CLWMR
 isobaric_sfc
 0
 ?
-46
-200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
+45
+200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
 ?
 0
 ?
@@ -1249,8 +1249,8 @@ RWMR
 isobaric_sfc
 0
 ?
-46
-200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
+45
+200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
 ?
 0
 ?
@@ -1286,8 +1286,8 @@ GRLE
 isobaric_sfc
 0
 ?
-46
-200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
+45
+200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
 ?
 0
 ?
@@ -1323,8 +1323,8 @@ SNMR
 isobaric_sfc
 0
 ?
-46
-200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
+45
+200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
 ?
 0
 ?
@@ -1360,8 +1360,8 @@ NCEP
 isobaric_sfc
 0
 ?
-46
-200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
+45
+200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
 ?
 0
 ?
diff --git a/parm/postxconfig-NT-hafs.txt b/parm/postxconfig-NT-hafs.txt
index d378fe543..03e551e5d 100644
--- a/parm/postxconfig-NT-hafs.txt
+++ b/parm/postxconfig-NT-hafs.txt
@@ -1,5 +1,5 @@
 1
-87
+88
 HURPRS
 32769
 ncep_nco
@@ -11,7 +11,7 @@ fcst
 fcst
 hour
 nws_ncep
-hur_weather_res_and_fcst
+hafs
 complex_packing_spatial_diff
 2nd_ord_sptdiff
 fltng_pnt
@@ -27,8 +27,8 @@ HGT
 isobaric_sfc
 0
 ?
-46
-200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
+45
+200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
 ?
 0
 ?
@@ -64,8 +64,8 @@ TMP
 isobaric_sfc
 0
 ?
-46
-200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
+45
+200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
 ?
 0
 ?
@@ -83,7 +83,7 @@ isobaric_sfc
 0
 0.0
 1
-3.0
+4.0
 0
 0
 0
@@ -101,8 +101,8 @@ SPFH
 isobaric_sfc
 0
 ?
-46
-200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
+45
+200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
 ?
 0
 ?
@@ -120,7 +120,7 @@ isobaric_sfc
 0
 0.0
 1
-4.0
+7.0
 0
 0
 0
@@ -138,8 +138,8 @@ RH
 isobaric_sfc
 0
 ?
-46
-200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
+45
+200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
 ?
 0
 ?
@@ -157,7 +157,7 @@ isobaric_sfc
 0
 0.0
 1
-2.0
+3.0
 0
 0
 0
@@ -175,8 +175,8 @@ UGRD
 isobaric_sfc
 0
 ?
-46
-200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
+45
+200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
 ?
 0
 ?
@@ -212,8 +212,8 @@ VGRD
 isobaric_sfc
 0
 ?
-46
-200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
+45
+200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
 ?
 0
 ?
@@ -238,19 +238,19 @@ isobaric_sfc
 ?
 ?
 ?
-20
-VVEL_ON_ISOBARIC_SFC
+284
+DZDT_ON_ISOBARIC_SFC
 ?
 1
 tmpl4_0
-VVEL
+DZDT
 ?
 ?
 isobaric_sfc
 0
 ?
-46
-200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
+45
+200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
 ?
 0
 ?
@@ -275,19 +275,19 @@ isobaric_sfc
 ?
 ?
 ?
-284
-DZDT_ON_ISOBARIC_SFC
+20
+VVEL_ON_ISOBARIC_SFC
 ?
 1
 tmpl4_0
-DZDT
+VVEL
 ?
 ?
 isobaric_sfc
 0
 ?
-46
-200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
+45
+200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
 ?
 0
 ?
@@ -305,7 +305,7 @@ isobaric_sfc
 0
 0.0
 1
--5.0
+5.0
 0
 0
 0
@@ -323,8 +323,8 @@ ABSV
 isobaric_sfc
 0
 ?
-46
-200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
+45
+200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
 ?
 0
 ?
@@ -360,8 +360,8 @@ TKE
 isobaric_sfc
 0
 ?
-46
-200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
+45
+200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
 ?
 0
 ?
@@ -386,19 +386,19 @@ isobaric_sfc
 ?
 ?
 ?
-166
-ICMR_ON_ISOBARIC_SFC
+153
+CLWMR_ON_ISOBARIC_SFC
 ?
 1
 tmpl4_0
-ICMR
+CLWMR
 ?
 ?
 isobaric_sfc
 0
 ?
-46
-200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
+45
+200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
 ?
 0
 ?
@@ -423,19 +423,19 @@ isobaric_sfc
 ?
 ?
 ?
-153
-CLWMR_ON_ISOBARIC_SFC
+166
+ICMR_ON_ISOBARIC_SFC
 ?
 1
 tmpl4_0
-CLWMR
+ICMR
 ?
 ?
 isobaric_sfc
 0
 ?
-46
-200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
+45
+200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
 ?
 0
 ?
@@ -453,7 +453,7 @@ isobaric_sfc
 0
 0.0
 1
-4.0
+6.0
 0
 0
 0
@@ -471,8 +471,8 @@ RWMR
 isobaric_sfc
 0
 ?
-46
-200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
+45
+200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
 ?
 0
 ?
@@ -490,7 +490,7 @@ isobaric_sfc
 0
 0.0
 1
-3.0
+6.0
 0
 0
 0
@@ -508,8 +508,8 @@ SNMR
 isobaric_sfc
 0
 ?
-46
-200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
+45
+200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
 ?
 0
 ?
@@ -527,7 +527,44 @@ isobaric_sfc
 0
 0.0
 1
-3.0
+6.0
+0
+0
+0
+?
+?
+?
+416
+GRLE_ON_ISOBARIC_SFC
+Graupel mixing ration on isobaric surface
+1
+tmpl4_0
+GRLE
+?
+?
+isobaric_sfc
+0
+?
+45
+200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
+?
+0
+?
+0
+?
+?
+?
+0
+0.0
+0
+0.0
+?
+0
+0.0
+0
+0.0
+1
+6.0
 0
 0
 0
@@ -545,8 +582,8 @@ REFD
 isobaric_sfc
 0
 ?
-46
-200. 500. 700. 1000. 2000. 3000. 5000. 7000. 7500. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
+45
+200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000. 47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.
 ?
 0
 ?
@@ -712,7 +749,7 @@ spec_hgt_lvl_above_grnd
 0
 0.0
 1
-4.0
+7.0
 0
 0
 0
@@ -897,7 +934,7 @@ surface
 0
 0.0
 1
-3.0
+4.0
 0
 0
 0
@@ -934,7 +971,7 @@ spec_hgt_lvl_above_grnd
 0
 0.0
 1
-5.0
+4.0
 0
 0
 0
@@ -1045,7 +1082,7 @@ surface
 0
 0.0
 1
-5.0
+4.0
 0
 0
 0
@@ -1193,7 +1230,7 @@ surface
 0
 0.0
 1
-3.0
+4.0
 0
 0
 0
@@ -1304,7 +1341,7 @@ entire_atmos_single_lyr
 0
 0.0
 1
-3.0
+6.0
 0
 0
 0
@@ -1452,7 +1489,7 @@ surface
 0
 0.0
 1
-3.0
+6.0
 0
 0
 0
@@ -1489,7 +1526,7 @@ entire_atmos_single_lyr
 0
 0.0
 1
-3.0
+4.0
 0
 0
 0
@@ -1526,7 +1563,7 @@ entire_atmos_single_lyr
 0
 0.0
 1
-3.0
+4.0
 0
 0
 0
@@ -1600,7 +1637,7 @@ surface
 0
 0.0
 1
-4.0
+6.0
 0
 0
 0
@@ -1637,7 +1674,7 @@ surface
 0
 0.0
 1
-4.0
+6.0
 0
 0
 0
@@ -1674,7 +1711,7 @@ surface
 0
 0.0
 1
-3.0
+6.0
 0
 0
 0
@@ -1711,7 +1748,7 @@ surface
 0
 0.0
 1
-3.0
+4.0
 0
 0
 0
@@ -1748,7 +1785,7 @@ surface
 0
 0.0
 1
-3.0
+6.0
 0
 0
 0
@@ -1785,7 +1822,7 @@ surface
 0
 0.0
 1
-3.0
+4.0
 0
 0
 0
@@ -1822,7 +1859,7 @@ top_of_atmos
 0
 0.0
 1
-3.0
+6.0
 0
 0
 0
@@ -1859,7 +1896,7 @@ top_of_atmos
 0
 0.0
 1
-3.0
+4.0
 0
 0
 0
@@ -1933,7 +1970,7 @@ top_of_atmos
 0
 0.0
 1
-3.0
+4.0
 0
 0
 0
@@ -1970,7 +2007,7 @@ surface
 0
 0.0
 1
-4.0
+6.0
 0
 0
 0
@@ -2044,7 +2081,7 @@ surface
 0
 0.0
 1
-2.7
+6.0
 0
 0
 0
@@ -2155,7 +2192,7 @@ surface
 0
 0.0
 1
-3.0
+4.0
 0
 0
 0
@@ -2192,7 +2229,7 @@ surface
 0
 0.0
 1
-3.0
+4.0
 0
 0
 0
@@ -2525,7 +2562,7 @@ surface
 0
 0.0
 1
-5.0
+4.0
 0
 0
 0
@@ -2636,7 +2673,7 @@ tropopause
 0
 0.0
 1
-3.0
+4.0
 0
 0
 0
@@ -2673,7 +2710,7 @@ tropopause
 0
 0.0
 1
-5.0
+4.0
 0
 0
 0
@@ -2821,7 +2858,7 @@ cloud_top
 0
 0.0
 1
-5.0
+4.0
 0
 0
 0
diff --git a/sorc/ncep_post.fd/AllGETHERV_GSD.f b/sorc/ncep_post.fd/AllGETHERV_GSD.f
index 4aff19d37..ae7e64021 100644
--- a/sorc/ncep_post.fd/AllGETHERV_GSD.f
+++ b/sorc/ncep_post.fd/AllGETHERV_GSD.f
@@ -10,7 +10,7 @@ SUBROUTINE AllGETHERV(GRID1)
 ! PROGRAM HISTORY LOG:
 !
       
-     use ctlblk_mod, only : im,jm,num_procs,me,jsta,jend
+     use ctlblk_mod, only : im,jm,num_procs,me,jsta,jend,mpi_comm_comp
 
      implicit none
 
@@ -28,7 +28,7 @@ SUBROUTINE AllGETHERV(GRID1)
 !     write(*,*) 'check mpi', im,jm,num_procs,me,jsta,jend
      SENDCOUNT=im*(jend-jsta+1)
      call MPI_ALLGATHER(SENDCOUNT, 1, MPI_INTEGER, RECVCOUNTS,1 , &
-                MPI_INTEGER, MPI_COMM_WORLD, ierr)
+                MPI_INTEGER, mpi_comm_comp, ierr)
      DISPLS(1)=0
      do i=2,num_procs
          DISPLS(i)=DISPLS(i-1)+RECVCOUNTS(i-1)
@@ -50,7 +50,7 @@ SUBROUTINE AllGETHERV(GRID1)
      endif
   
      call MPI_ALLGATHERV(ibufsend, ij, MPI_REAL, ibufrecv, RECVCOUNTS,DISPLS, &
-                MPI_REAL, MPI_COMM_WORLD, ierr)
+                MPI_REAL, mpi_comm_comp, ierr)
 
      ij=0
      do j=1,JM
diff --git a/sorc/ncep_post.fd/BNDLYR.f b/sorc/ncep_post.fd/BNDLYR.f
index 371e241dc..a39b1bab6 100644
--- a/sorc/ncep_post.fd/BNDLYR.f
+++ b/sorc/ncep_post.fd/BNDLYR.f
@@ -72,7 +72,7 @@ SUBROUTINE BNDLYR(PBND,TBND,QBND,RHBND,UBND,VBND,       &
       use masks,      only: lmh
       use params_mod, only: d00, gi, pq0, a2, a3, a4
       use ctlblk_mod, only: jsta_2l, jend_2u, lm, jsta, jend, modelname,      &
-                            jsta_m, jend_m, im, nbnd
+                            jsta_m, jend_m, im, nbnd, spval
       use physcons_post,   only: con_rd, con_rv, con_eps, con_epsm1
       use gridspec_mod, only: gridtype
       use upp_physics, only: FPVSNEW
@@ -180,6 +180,7 @@ SUBROUTINE BNDLYR(PBND,TBND,QBND,RHBND,UBND,VBND,       &
             DO I=1,IM
 !
               PM = PMID(I,J,L)
+              IF(PM<SPVAL)THEN
               IF((PBINT(I,J,LBND)   >= PM).AND.              & 
                  (PBINT(I,J,LBND+1) <= PM)) THEN
                 DP = PINT(I,J,L+1) - PINT(I,J,L)
@@ -205,6 +206,7 @@ SUBROUTINE BNDLYR(PBND,TBND,QBND,RHBND,UBND,VBND,       &
                 END IF 
                 QSBND(I,J,LBND) = QSBND(I,J,LBND) + QSAT*DP
               ENDIF
+              ENDIF
             ENDDO
           ENDDO
         ENDDO
@@ -333,7 +335,7 @@ SUBROUTINE BNDLYR(PBND,TBND,QBND,RHBND,UBND,VBND,       &
               END IF 
               WBND(I,J,LBND)    = WH(I,J,L)
               QCNVBND(I,J,LBND) = QCNVG(I,J,L)
-              IF(MODELNAME == 'GFS')THEN
+              IF(MODELNAME == 'GFS' .OR. MODELNAME == 'FV3R')THEN
                 ES   = FPVSNEW(T(I,J,L))
                 ES   = MIN(ES,PM)
                 QSAT = CON_EPS*ES/(PM+CON_EPSM1*ES)
diff --git a/sorc/ncep_post.fd/CALGUST.f b/sorc/ncep_post.fd/CALGUST.f
index 4ec94b9c8..07c4a7f1c 100644
--- a/sorc/ncep_post.fd/CALGUST.f
+++ b/sorc/ncep_post.fd/CALGUST.f
@@ -113,6 +113,8 @@ SUBROUTINE CALGUST(LPBL,ZPBL,GUST)
              IE = I + MOD(J+1,2) 
              IW = I + MOD(J+1,2)-1
 
+           if(U10H(I,J)<spval.and.UH(I,J+1,L)<spval.and.UH(IE,J,L)<spval.and.UH(IW,J,L)<spval.and.UH(I,J-1,L)<spval) then
+
 !        USFC=D25*(U10(I,J-1)+U10(IW,J)+U10(IE,J)+U10(I,J+1)) 
 !        VSFC=D25*(V10(I,J-1)+V10(IW,J)+V10(IE,J)+V10(I,J+1))
              USFC = U10H(I,J)
@@ -121,19 +123,31 @@ SUBROUTINE CALGUST(LPBL,ZPBL,GUST)
              U0   = D25*(UH(I,J-1,L)+UH(IW,J,L)+UH(IE,J,L)+UH(I,J+1,L))
              V0   = D25*(VH(I,J-1,L)+VH(IW,J,L)+VH(IE,J,L)+VH(I,J+1,L))
              WIND = SQRT(U0*U0 + V0*V0)
+
+             else
+             WIND = spval
+             endif
+
            ELSE IF(gridtype == 'B') THEN
              IE = I 
              IW = I-1
 
 !        USFC=D25*(U10(I,J-1)+U10(IW,J)+U10(IE,J)+U10(IW,J-1)) 
 !        VSFC=D25*(V10(I,J-1)+V10(IW,J)+V10(IE,J)+V10(IW,J-1))
+
+             if(U10H(I,J)<spval.and.UH(IW,J-1,L)<spval) then
+
              USFC = U10H(I,J)
              VSFC = V10H(I,J)
              SFCWIND = SQRT(USFC*USFC + VSFC*VSFC)
              U0 = D25*(UH(I,J-1,L)+UH(IW,J,L)+UH(IE,J,L)+UH(IW,J-1,L))
              V0 = D25*(VH(I,J-1,L)+VH(IW,J,L)+VH(IE,J,L)+VH(IW,J-1,L))
              WIND = SQRT(U0*U0 + V0*V0) 
+             else
+             WIND = spval
+             endif
            ELSE IF(gridtype == 'A') THEN
+
              USFC    = U10(I,J)
              VSFC    = V10(I,J)
              if (usfc < spval .and. vsfc < spval) then
@@ -147,6 +161,8 @@ SUBROUTINE CALGUST(LPBL,ZPBL,GUST)
 ! in RUC do 342 k=2,k1-1, where k1 - first level above PBLH
                GUST(I,J) = SFCWIND
                do K=LM-1,L-1,-1
+
+                 if(UH(I,J,L)<spval) then
                  U0   = UH(I,J,K)
                  V0   = VH(I,J,K)
                  WIND = SQRT(U0*U0 + V0*V0)
@@ -154,11 +170,18 @@ SUBROUTINE CALGUST(LPBL,ZPBL,GUST)
                  DZ = ZMID(I,J,K)-ZSFC
                  DELWIND  = DELWIND*(1.0-MIN(0.5,DZ/2000.))
                  GUST(I,J) = MAX(GUST(I,J),SFCWIND+DELWIND)
+               else
+                 GUST(I,J) = spval
+               endif
                enddo
              else
+               if(UH(I,J,L)<spval) then
                U0   = UH(I,J,L)
                V0   = VH(I,J,L)
                WIND = SQRT(U0*U0 + V0*V0 )
+               else
+               WIND = spval
+               endif
              endif ! endif RAPR
 
            ELSE
diff --git a/sorc/ncep_post.fd/CALMCVG.f b/sorc/ncep_post.fd/CALMCVG.f
index 17d92dbcb..3151448c3 100644
--- a/sorc/ncep_post.fd/CALMCVG.f
+++ b/sorc/ncep_post.fd/CALMCVG.f
@@ -95,8 +95,8 @@ SUBROUTINE CALMCVG(Q1D,U1D,V1D,QCNVG)
 !$omp  parallel do private(i,j,qudx,qvdy,r2dx,r2dy)
        DO J=JSTA_M,JEND_M
          DO I=2,IM-1
-           IF(VWND(I,J+1)<SPVAL.AND.VWND(I,J-1)<SPVAL.AND.          &
-              UWND(I+1,J)<SPVAL.AND.UWND(I-1,J)<SPVAL) THEN
+           IF(Q1D(I,J+1)<SPVAL.AND.Q1D(I,J-1)<SPVAL.AND.          &
+              Q1D(I+1,J)<SPVAL.AND.Q1D(I-1,J)<SPVAL) THEN
              R2DX   = 1./(2.*DX(I,J))   !MEB DX?
              R2DY   = 1./(2.*DY(I,J))   !MEB DY?  
              QUDX   = (Q1D(I+1,J)*UWND(I+1,J)-Q1D(I-1,J)*UWND(I-1,J))*R2DX
diff --git a/sorc/ncep_post.fd/CALPBL.f b/sorc/ncep_post.fd/CALPBL.f
index bbf262bd4..d71f9676a 100644
--- a/sorc/ncep_post.fd/CALPBL.f
+++ b/sorc/ncep_post.fd/CALPBL.f
@@ -76,8 +76,10 @@ SUBROUTINE CALPBL(PBLRI)
       DO L=LM,1,-1
         DO J=JSTA,JEND
           DO I=1,IM
+            if( PMID(I,J,L)<SPVAL) then
             APE        = (H10E5/PMID(I,J,L))**CAPA
             THV(I,J,L) = (Q(I,J,L)*D608+H1)*T(I,J,L)*APE
+            endif
           ENDDO
         ENDDO
       ENDDO
@@ -127,6 +129,8 @@ SUBROUTINE CALPBL(PBLRI)
         DO J=JSTA_M,JEND_M
           DO I=2,IM-1
 !
+            if( PMID(I,J,L)<SPVAL) then
+
             RIF(I,J) = 0.
             IF(IFRSTLEV(I,J) == 0) THEN
               RIBP(I,J) = RIF(I,J)
@@ -211,6 +215,9 @@ SUBROUTINE CALPBL(PBLRI)
             LVLP(I,J) = L-1
 !
  10         CONTINUE
+
+            endif !spval
+
           ENDDO
         ENDDO
       ENDDO
diff --git a/sorc/ncep_post.fd/CALPBLREGIME.f b/sorc/ncep_post.fd/CALPBLREGIME.f
index db3dbe95a..fbbc9dc33 100644
--- a/sorc/ncep_post.fd/CALPBLREGIME.f
+++ b/sorc/ncep_post.fd/CALPBLREGIME.f
@@ -104,6 +104,8 @@ SUBROUTINE CALPBLREGIME(PBLREGIME)
       DO J=JSTA_M,JEND_M
         DO I=2,IM-1
 !
+          IF(PMID(I,J,LM)<SPVAL .AND. QS(I,J)<SPVAL .AND. &
+             SMSTAV(I,J)<SPVAL) THEN 
           APE  = (P1000/PMID(I,J,LM))**CAPA
           THX  = T(I,J,LM)*APE
           THVX = (Q(I,J,LM)*D608+H1)*THX
@@ -158,6 +160,7 @@ SUBROUTINE CALPBLREGIME(PBLREGIME)
 !         jj=(jsta+jend)/2
 !         if(i==ii.and.j==jj)print*,'Debug: CALPBLREGIME ',i,j,br,     &  
 !         PBLREGIME(I,J)
+          END IF !end IF PMID 
    
         ENDDO
       ENDDO
diff --git a/sorc/ncep_post.fd/CALPW.f b/sorc/ncep_post.fd/CALPW.f
index c16619bed..2850107ef 100644
--- a/sorc/ncep_post.fd/CALPW.f
+++ b/sorc/ncep_post.fd/CALPW.f
@@ -65,7 +65,7 @@ SUBROUTINE CALPW(PW,IDECID)
       use vrbls4d,    only: smoke
       use masks,      only: htm
       use params_mod, only: tfrz, gi
-      use ctlblk_mod, only: lm, jsta, jend, im
+      use ctlblk_mod, only: lm, jsta, jend, im, spval
       use upp_physics, only: FPVSNEW
 !- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
       implicit none
@@ -290,6 +290,7 @@ SUBROUTINE CALPW(PW,IDECID)
 !$omp  parallel do private(i,j,dp)
         DO J=JSTA,JEND
           DO I=1,IM
+            if(PINT(I,J,L+1) <spval .and. Qdum(I,J) < spval) then
              DP      = PINT(I,J,L+1) - PINT(I,J,L)
              PW(I,J) = PW(I,J) + Qdum(I,J)*DP*GI*HTM(I,J,L)
             IF (IDECID == 17 .or. IDECID == 20 .or. IDECID == 21) THEN
@@ -299,6 +300,10 @@ SUBROUTINE CALPW(PW,IDECID)
              PW(I,J) = PW(I,J) + Qdum(I,J)
             ENDIF
             IF (IDECID == 14) PWS(I,J) = PWS(I,J) + QS(I,J)*DP*GI*HTM(I,J,L)
+            else
+             PW(I,J) = spval
+             PWS(I,J) = spval
+            endif
           ENDDO
         ENDDO
       ENDDO                 ! l loop
@@ -308,7 +313,9 @@ SUBROUTINE CALPW(PW,IDECID)
 !$omp  parallel do private(i,j,dp)
         DO J=JSTA,JEND
           DO I=1,IM
+            if( PW(I,J)<spval) then
             PW(I,J) = max(0.,PW(I,J)/PWS(I,J)*100.) 
+            endif
           ENDDO
         ENDDO
       END IF
@@ -319,7 +326,9 @@ SUBROUTINE CALPW(PW,IDECID)
 !$omp  parallel do private(i,j)
         DO J=JSTA,JEND
           DO I=1,IM
+            if( PW(I,J)<spval) then
             PW(I,J) = PW(I,J) / 2.14e-5
+            endif
           ENDDO
         ENDDO
       endif
diff --git a/sorc/ncep_post.fd/CALRAD_WCLOUD_newcrtm.f b/sorc/ncep_post.fd/CALRAD_WCLOUD_newcrtm.f
index 6d2aec892..7cdfe7819 100644
--- a/sorc/ncep_post.fd/CALRAD_WCLOUD_newcrtm.f
+++ b/sorc/ncep_post.fd/CALRAD_WCLOUD_newcrtm.f
@@ -10,6 +10,7 @@
 !!            CHANNEL SELECTION USING LVLS FROM WRF_CNTRL.PARM
 !! -  19-04-01 Sharon NEBUDA - Added output option for GOES-16 & GOES-17 ABI IR Channels 7-16
 !! -  20-04-09 Tracy Hertneky - Added Himawari-8 AHI CH7-CH16
+!! -  21-01-10 Web Meng - Added checking points for skiping grids with filling value spval
 !!
 !!   OUTPUT FILES:
 !!     NONE
@@ -52,7 +53,7 @@ SUBROUTINE CALRAD_WCLOUD
   use crtm_cloud_define, only:  water_cloud,ice_cloud,rain_cloud,snow_cloud,graupel_cloud,hail_cloud
   use message_handler, only: success,warning, display_message
 
-  use params_mod, only: pi, rtd, p1000, capa, h1000, h1, g, rd, d608, qconv
+  use params_mod, only: pi, rtd, p1000, capa, h1000, h1, g, rd, d608, qconv, small
   use rqstfld_mod, only: iget, id, lvls, iavblfld
   use ctlblk_mod, only: modelname, ivegsrc, novegtype, imp_physics, lm, spval, icu_physics,&
               grib, cfld, fld_info, datapd, idat, im, jsta, jend, jm, me
@@ -690,7 +691,18 @@ SUBROUTINE CALRAD_WCLOUD
                         (isis=='abi_gr'  .and. post_abigr) )then
 
               do j=jsta,jend
-                 do i=1,im
+                 loopi1:do i=1,im
+
+                    ! Skiping the grids with filling value spval
+                    do k=1,lm
+                      if(abs(pmid(i,j,k)-spval)<=small .or. &
+                         abs(t(i,j,k)-spval)<=small) then
+                         do n=1,channelinfo(sensorindex)%n_channels
+                           tb(i,j,n)=spval
+                         enddo
+                         cycle loopi1
+                      endif
+                    enddo
 
                     !    Load geometry structure
                     !    geometryinfo(1)%sensor_zenith_angle = zasat*rtd  ! local zenith angle ???????
@@ -1104,7 +1116,7 @@ SUBROUTINE CALRAD_WCLOUD
                        !       tb3(i,j)=spval
                        !       tb4(i,j)=spval
                     END IF ! endif block for allowable satellite zenith angle 
-                 end do ! end loop for i
+                 end do loopi1 ! end loop for i
               end do ! end loop for j 
   
               !      error_status = crtm_destroy(channelinfo)
@@ -1233,7 +1245,19 @@ SUBROUTINE CALRAD_WCLOUD
                         iget(461)>0 .or. iget(462)>0 .or. iget(463)>0)))then
 
               do j=jsta,jend
-                 do i=1,im
+                 loopi2:do i=1,im
+
+                    ! Skiping the grids with filling value spval
+                    do k=1,lm
+                      if(abs(pmid(i,j,k)-spval)<=small .or. &
+                         abs(t(i,j,k)-spval)<=small) then
+                         do n=1,channelinfo(sensorindex)%n_channels
+                           tb(i,j,n)=spval
+                         enddo
+                         cycle loopi2
+                      endif
+                    enddo
+
                     !    Load geometry structure
                     !    geometryinfo(1)%sensor_zenith_angle = zasat*rtd  ! local zenith angle ???????
                     ! compute satellite zenith angle
@@ -1665,7 +1689,7 @@ SUBROUTINE CALRAD_WCLOUD
                           tb(i,j,n)=spval
                        end do
                     END IF ! endif block for allowable satellite zenith angle 
-                 end do ! end loop for i
+                 end do loopi2 ! end loop for i
               end do ! end loop for j 
 
                !      error_status = crtm_destroy(channelinfo)
diff --git a/sorc/ncep_post.fd/CLDRAD.f b/sorc/ncep_post.fd/CLDRAD.f
index c5885711b..03712f590 100644
--- a/sorc/ncep_post.fd/CLDRAD.f
+++ b/sorc/ncep_post.fd/CLDRAD.f
@@ -922,7 +922,11 @@ SUBROUTINE CLDRAD
         DO L=LM,1,-1
           DO J=JSTA,JEND
             DO I=1,IM
+              if(CFR(I,J,L)<spval) then
               FULL_CLD(I,J)=CFR(I,J,L)    !- 3D cloud fraction (from radiation)
+              else
+              FULL_CLD(I,J)=spval
+              endif
             ENDDO
           ENDDO
           CALL AllGETHERV(FULL_CLD)
@@ -932,13 +936,18 @@ SUBROUTINE CLDRAD
               FRAC=0.
               DO JC=max(1,J-numr),min(JM,J+numr)
                 DO IC=max(1,I-numr),min(IM,I+numr)
+!                  if(IC>=1.and.IC<=IM.and.JM>=JSTA.and.JM<=JEND) then
                   IF(FULL_CLD(IC,JC) /= SPVAL) THEN
                     NUMPTS=NUMPTS+1
                     FRAC=FRAC+FULL_CLD(IC,JC)
                   ENDIF
+!                  else
+!                    FRAC=spval
+!                  endif
                 ENDDO
               ENDDO
               IF (NUMPTS>0) FRAC=FRAC/REAL(NUMPTS)
+              if(PMID(I,J,L)<spval) then
               PCLDBASE=PMID(I,J,L)    !-- Using PCLDBASE variable for convenience
               IF (PCLDBASE>=PTOP_LOW) THEN
                 CFRACL(I,J)=MAX(CFRACL(I,J),FRAC)
@@ -948,6 +957,12 @@ SUBROUTINE CLDRAD
                 CFRACH(I,J)=MAX(CFRACH(I,J),FRAC)
               ENDIF
               TCLD(I,J)=MAX(TCLD(I,J),FRAC)
+              else
+              CFRACL(I,J)=spval
+              CFRACM(I,J)=spval
+              CFRACH(I,J)=spval
+              TCLD(I,J)=spval
+              endif
             ENDDO  ! I
           ENDDO    ! J
         ENDDO      ! L
@@ -2475,9 +2490,22 @@ SUBROUTINE CLDRAD
           DO I=1,IM
             ITOP=ITOPT(I,J)
             IF (ITOP>0 .AND. ITOP<=NINT(LMH(I,J))) THEN
-              CLDP(I,J) = PMID(I,J,ITOP)
-              CLDZ(I,J) = ZMID(I,J,ITOP)
-              CLDT(I,J) = T(I,J,ITOP)
+              IF(T(I,J,ITOP)<SPVAL .AND. &
+                 PMID(I,J,ITOP)<SPVAL .AND. &
+                 ZMID(I,J,ITOP)<SPVAL) THEN
+                CLDP(I,J) = PMID(I,J,ITOP)
+                CLDZ(I,J) = ZMID(I,J,ITOP)
+                CLDT(I,J) = T(I,J,ITOP)
+              ELSE
+                IF(MODELNAME == 'RAPR') then
+                  CLDP(I,J) = SPVAL
+                  CLDZ(I,J) = SPVAL
+                ELSE
+                  CLDP(I,J) = -50000.
+                  CLDZ(I,J) = -5000.
+                ENDIF
+                CLDT(I,J) = -500. 
+              ENDIF
             ELSE
               IF(MODELNAME == 'RAPR') then
                 CLDP(I,J) = SPVAL
diff --git a/sorc/ncep_post.fd/INITPOST_NETCDF.f b/sorc/ncep_post.fd/INITPOST_NETCDF.f
index d8c2d1a71..f2f6ac4b8 100644
--- a/sorc/ncep_post.fd/INITPOST_NETCDF.f
+++ b/sorc/ncep_post.fd/INITPOST_NETCDF.f
@@ -825,16 +825,6 @@ SUBROUTINE INITPOST_NETCDF(ncid3d)
        do j=jsta,jend
          do i=1,im
             cwm(i,j,l)=spval
-!           zint(i,j,l)=zint(i,j,l+1)+buf(i,j)
-!           if(abs(dpres(i,j,l))>1.0e5)print*,'bad dpres ',i,j,dpres(i,j,l)
-!make sure delz is positive
-           if(dpres(i,j,l)/=spval .and. t(i,j,l)/=spval .and. &
-           q(i,j,l)/=spval .and. buf3d(i,j,l)/=spval)then
-            pmid(i,j,l)=rgas*dpres(i,j,l)* &
-                t(i,j,l)*(q(i,j,l)*fv+1.0)/grav/abs(buf3d(i,j,l))
-           else
-            pmid(i,j,l)=spval
-           end if
 ! dong add missing value
            if (wh(i,j,l) < spval) then
             omga(i,j,l)=(-1.)*wh(i,j,l)*dpres(i,j,l)/abs(buf3d(i,j,l))
@@ -857,6 +847,7 @@ SUBROUTINE INITPOST_NETCDF(ncid3d)
        call read_netcdf_3d_scatter(me,ncid3d,1,im,jm,jsta,jsta_2l &
        ,jend_2u,MPI_COMM_COMP,icnt,idsp,spval,recname(14) &
        ,lm,qqg(1,jsta_2l,1))
+
 ! calculate CWM from FV3 output
        do l=1,lm
        do j=jsta,jend
@@ -864,12 +855,13 @@ SUBROUTINE INITPOST_NETCDF(ncid3d)
             cwm(i,j,l)=qqg(i,j,l)+qqs(i,j,l)+qqr(i,j,l)+qqi(i,j,l)+qqw(i,j,l)
          enddo
        enddo
-       if(debugprint)print*,'sample l,t,q,u,v,w,pmid= ',isa,jsa,l &
+       if(debugprint)print*,'sample l,t,q,u,v,w= ',isa,jsa,l &
        ,t(isa,jsa,l),q(isa,jsa,l),uh(isa,jsa,l),vh(isa,jsa,l) &
-       ,wh(isa,jsa,l),pmid(isa,jsa,l)
+       ,wh(isa,jsa,l)
        if(debugprint)print*,'sample l cwm for FV3',l, &
           cwm(isa,jsa,l)
       end do 
+
 ! max hourly updraft velocity
       VarName='upvvelmax'
       call read_netcdf_2d_scatter(me,ncid3d,1,im,jm,jsta,jsta_2l &
@@ -941,25 +933,29 @@ SUBROUTINE INITPOST_NETCDF(ncid3d)
       do l=2,lp1
         do j=jsta,jend
           do i=1,im
-            pint(i,j,l)   = pint(i,j,l-1) + dpres(i,j,l-1)
+            if (dpres(i,j,l-1)<spval .and. pint(i,j,l-1)<spval) then
+              pint(i,j,l)= pint(i,j,l-1) + dpres(i,j,l-1)
+            else
+              pint(i,j,l)=spval
+            endif
           enddo
         enddo
-        if (me == 0) print*,'sample model pint,pmid' ,ii,jj,l &
-          ,pint(ii,jj,l),pmid(ii,jj,l)
+!        if (me == 0) print*,'sample model pint,pmid' ,ii,jj,l &
+!          ,pint(ii,jj,l),pmid(ii,jj,l)
       end do
 
-!      do l=lm,1,-1
-!        do j=jsta,jend
-!          do i=1,im
-!           if(pint(i,j,l+1)/=spval .and. dpres(i,j,l)/=spval)then
-!            pint(i,j,l)=pint(i,j,l+1)-dpres(i,j,l)
-!           else
-!            pint(i,j,l)=spval
-!           end if
-!          end do
-!        end do
-!        print*,'sample pint= ',isa,jsa,l,pint(isa,jsa,l)
-!      end do
+!compute pmid from averaged two layer pint
+      do l=lm,1,-1
+        do j=jsta,jend
+          do i=1,im
+            if (pint(i,j,l)<spval .and. pint(i,j,l+1)<spval) then
+              pmid(i,j,l)=0.5*(pint(i,j,l)+pint(i,j,l+1))
+            else
+              pmid(i,j,l)=spval
+            endif
+          enddo
+        enddo
+      enddo
 
 ! surface height from FV3 
 ! dong set missing value for zint
@@ -1021,18 +1017,6 @@ SUBROUTINE INITPOST_NETCDF(ncid3d)
       
       pt    = ak5(1) 
 
-!      else
-!        do l=2,lm
-!!$omp parallel do private(i,j)
-!          do j=jsta,jend
-!            do i=1,im
-!              pint(i,j,l)   = pint(i,j,l-1) + dpres(i,j,l-1)
-!            enddo
-!          enddo
-!        if (me == 0) print*,'sample pint,pmid' ,ii,jj,l,pint(ii,jj,l),pmid(ii,jj,l)
-!        end do
-!      endif
-!
 
       deallocate (vcoord4)
 !+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -1095,36 +1079,6 @@ SUBROUTINE INITPOST_NETCDF(ncid3d)
         CALL MICROINIT(imp_physics)
       end if
 
-! Chuang: zhour is when GFS empties bucket last so using this
-! to compute buket will result in changing bucket with forecast time.
-! set default bucket for now
-
-!     call nemsio_getheadvar(ffile,'zhour',zhour,iret=iret)
-!     if(iret == 0) then
-!        tprec   = 1.0*ifhr-zhour
-!        tclod   = tprec
-!        trdlw   = tprec
-!        trdsw   = tprec
-!        tsrfc   = tprec
-!        tmaxmin = tprec
-!        td3d    = tprec
-!        print*,'tprec from flux file header= ',tprec
-!     else
-!        print*,'Error reading accumulation bucket from flux file', &
-!            'header - will try to read from env variable FHZER'
-!        CALL GETENV('FHZER',ENVAR)
-!        read(ENVAR, '(I2)')idum
-!        tprec   = idum*1.0
-!        tclod   = tprec
-!        trdlw   = tprec
-!        trdsw   = tprec
-!        tsrfc   = tprec
-!        tmaxmin = tprec
-!        td3d    = tprec
-!        print*,'TPREC from FHZER= ',tprec
-!     end if
-
-
         tprec   = float(fhzero)
         if(ifhr>240)tprec=12.
         tclod   = tprec
@@ -1136,131 +1090,6 @@ SUBROUTINE INITPOST_NETCDF(ncid3d)
         print*,'tprec = ',tprec
 
 
-! start reading 2d netcdf file
-! surface pressure
-!      VarName='pressfc'
-!      call read_netcdf_2d_scatter(me,ncid2d,1,im,jm,jsta,jsta_2l &
-!       ,jend_2u,MPI_COMM_COMP,icnt,idsp,spval,VarName &
-!       ,pint(1,jsta_2l,lp1))
-!      if(debugprint)print*,'sample ',VarName,' =',pint(isa,jsa,lp1)
-!      do l=lm,1,-1
-!        do j=jsta,jend
-!          do i=1,im
-!            pint(i,j,l)=pint(i,j,l+1)-dpres(i,j,l)
-!            if(pint(i,j,l)>1.0E6)print*,'bad P ',i,j,l,pint(i,j,l) &
-!            ,pint(i,j,l+1),dpres(i,j,l)
-!          end do
-!        end do
-!        print*,'sample pint= ',isa,jsa,l,pint(isa,jsa,l)
-!      end do
-! surface height from FV3 already multiplied by G
-!      VarName='orog'
-!      call read_netcdf_2d_scatter(me,ncid2d,1,im,jm,jsta,jsta_2l &
-!       ,jend_2u,MPI_COMM_COMP,icnt,idsp,spval,VarName,fis)
-!      if(debugprint)print*,'sample ',VarName,' =',fis(isa,jsa)
-!      do j=jsta,jend
-!        do i=1,im
-!          if (fis(i,j) /= spval) then
-!            zint(i,j,lp1) = fis(i,j)
-!            fis(i,j)      = fis(i,j) * grav
-!          else
-!            zint(i,j,lp1) = spval
-!            fis(i,j)      = spval
-!          endif
-!        enddo
-!      enddo
-      
-!      do l=lm,1,-1
-!        do j=jsta,jend
-!          do i=1,im
-!            if(zint(i,j,l+1)/=spval .and. buf3d(i,j,l)/=spval)then
-!             zint(i,j,l)=zint(i,j,l+1)+buf3d(i,j,l)
-!             if(zint(i,j,l)>1.0E6)print*,'bad H ',i,j,l,zint(i,j,l)
-!            else
-!             zint(i,j,l)=spval
-!            end if
-!          end do
-!        end do
-!        print*,'sample zint= ',isa,jsa,l,zint(isa,jsa,l)
-!      end do
-
-! Per communication with Fanglin, P from model in not monotonic
-! so compute P using ak and bk for now Sep. 2017
-!        do l=lm,1,-1
-!!!$omp parallel do private(i,j)
-!          do j=jsta,jend
-!            do i=1,im
-!              pint(i,j,l) = ak5(lm+2-l) + bk5(lm+2-l)*pint(i,j,lp1)
-!              pmid(i,j,l) = 0.5*(pint(i,j,l)+pint(i,j,l+1))  ! for now -
-!            enddo
-!          enddo
-!          print*,'sample pint,pmid' &
-!          ,l,pint(isa,jsa,l),pmid(isa,jsa,l)
-!        enddo
-
-!      allocate(wrk1(im,jsta:jend),wrk2(im,jsta:jend))
-!      do j=jsta,jend
-!        do i=1,im
-!          pd(i,j)         = spval           ! GFS does not output PD
-!          pint(i,j,1)     = PT
-!          alpint(i,j,lp1) = log(pint(i,j,lp1))
-!          wrk1(i,j)       = log(PMID(I,J,LM))
-!          wrk2(i,j)       = T(I,J,LM)*(Q(I,J,LM)*fv+1.0)
-!          FI(I,J,1)       = FIS(I,J)                      &
-!                          + wrk2(i,j)*rgas*(ALPINT(I,J,Lp1)-wrk1(i,j))
-!          ZMID(I,J,LM)    = FI(I,J,1) * gravi
-!        end do
-!      end do
-
-! SECOND, INTEGRATE HEIGHT HYDROSTATICLY, GFS integrate height on
-! mid-layer
-
-!      DO L=LM,2,-1  ! omit computing model top height 
-!        ll = l - 1
-!        do j = jsta, jend
-!          do i = 1, im
-!            alpint(i,j,l) = log(pint(i,j,l))
-!            tvll          = T(I,J,LL)*(Q(I,J,LL)*fv+1.0)
-!            pmll          = log(PMID(I,J,LL))
-
-!            FI(I,J,2)     = FI(I,J,1) + (0.5*rgas)*(wrk2(i,j)+tvll)   &
-!                                      * (wrk1(i,j)-pmll)
-!            ZMID(I,J,LL)  = FI(I,J,2) * gravi
-!
-!            FACT          = (ALPINT(I,J,L)-wrk1(i,j)) / (pmll-wrk1(i,j))
-!            ZINT(I,J,L)   = ZMID(I,J,L) +(ZMID(I,J,LL)-ZMID(I,J,L))*FACT
-!            FI(I,J,1)     = FI(I,J,2)
-!            wrk1(i,J)     = pmll
-!            wrk2(i,j)     = tvll
-!          ENDDO
-!        ENDDO
-
-!        print*,'L ZINT= ',l,zint(isa,jsa,l),ZMID(isa,jsa,l)         
-!        ,'alpint=',ALPINT(ii,jj,l),'pmid=',LOG(PMID(Ii,Jj,L)),  &
-!        'pmid(l-1)=',LOG(PMID(Ii,Jj,L-1)),'zmd=',ZMID(Ii,Jj,L), &
-!        'zmid(l-1)=',ZMID(Ii,Jj,L-1)
-!      ENDDO
-!      deallocate(wrk1,wrk2)
-
-!      do l=lp1,2,-1
-!        do j=jsta,jend
-!          do i=1,im
-!            alpint(i,j,l)=log(pint(i,j,l))
-!          end do
-!        end do
-!      end do
-
-!      do l=lm,2,-1
-!        do j=jsta,jend
-!          do i=1,im
-!            zmid(i,j,l)=zint(i,j,l+1)+(zint(i,j,l)-zint(i,j,l+1))* &
-!                    (log(pmid(i,j,l))-alpint(i,j,l+1))/ &
-!                    (alpint(i,j,l)-alpint(i,j,l+1))
-!            if(zmid(i,j,l)>1.0E6)print*,'bad Hmid ',i,j,l,zmid(i,j,l)
-!          end do
-!        end do
-!      end do
-
 ! instantaneous 3D cloud fraction
       VarName='cldfra'
 !      do l=1,lm
@@ -1372,7 +1201,7 @@ SUBROUTINE INITPOST_NETCDF(ncid3d)
           twbs(i,j)  = SPVAL ! GFS does not have inst sensible heat flux
           qwbs(i,j)  = SPVAL ! GFS does not have inst latent heat flux
 !assign sst
-          if (sm(i,j) /= 0.0) then
+          if (sm(i,j) /= 0.0 .and. ths(i,j) < spval ) then
             if (sice(i,j) >= 0.15) then
               sst(i,j) = 271.4
             else
@@ -2001,10 +1830,20 @@ SUBROUTINE INITPOST_NETCDF(ncid3d)
        call read_netcdf_2d_scatter(me,ncid2d,1,im,jm,jsta,jsta_2l &
        ,jend_2u,MPI_COMM_COMP,icnt,idsp,spval,VarName,rswin)
 
+! time averaged model top incoming shortwave
+      VarName='dswrf_avetoa'
+      call read_netcdf_2d_scatter(me,ncid2d,1,im,jm,jsta,jsta_2l &
+       ,jend_2u,MPI_COMM_COMP,icnt,idsp,spval,VarName,aswintoa)
+!     if(debugprint)print*,'sample l',VarName,' = ',1,aswintoa(isa,jsa)
+
 ! inst incoming clear sky sfc shortwave
-      VarName='csdlf'
-       call read_netcdf_2d_scatter(me,ncid2d,1,im,jm,jsta,jsta_2l &
-       ,jend_2u,MPI_COMM_COMP,icnt,idsp,spval,VarName,rswinc)
+! FV3 do not output instant incoming clear sky sfc shortwave
+      !$omp parallel do private(i,j)
+      do j=jsta_2l,jend_2u
+        do i=1,im
+          rswinc(i,j) = spval 
+        enddo
+      enddo
 
 ! time averaged incoming sfc uv-b using getgb
       VarName='duvb_ave'
@@ -2036,12 +1875,6 @@ SUBROUTINE INITPOST_NETCDF(ncid3d)
       call read_netcdf_2d_scatter(me,ncid2d,1,im,jm,jsta,jsta_2l &
        ,jend_2u,MPI_COMM_COMP,icnt,idsp,spval,VarName,rswout)
 
-! time averaged model top incoming shortwave
-      VarName='dswrf_avetoa'
-      call read_netcdf_2d_scatter(me,ncid2d,1,im,jm,jsta,jsta_2l &
-       ,jend_2u,MPI_COMM_COMP,icnt,idsp,spval,VarName,aswintoa)
-!     if(debugprint)print*,'sample l',VarName,' = ',1,aswintoa(isa,jsa)      
-
 ! time averaged model top outgoing shortwave
       VarName='uswrf_avetoa'
       call read_netcdf_2d_scatter(me,ncid2d,1,im,jm,jsta,jsta_2l &
@@ -2144,13 +1977,13 @@ SUBROUTINE INITPOST_NETCDF(ncid3d)
       VarName='uflx'
       call read_netcdf_2d_scatter(me,ncid2d,1,im,jm,jsta,jsta_2l &
        ,jend_2u,MPI_COMM_COMP,icnt,idsp,spval,VarName,sfcuxi)
-!     if(debugprint)print*,'sample l',VarName,' = ',1,sfcuxi(isa,jsa)
+     if(debugprint)print*,'sample l',VarName,' = ',1,sfcuxi(isa,jsa)
 
 ! inst meridional momentum flux using nemsio
       VarName='vflx'
       call read_netcdf_2d_scatter(me,ncid2d,1,im,jm,jsta,jsta_2l &
        ,jend_2u,MPI_COMM_COMP,icnt,idsp,spval,VarName,sfcvxi)
-!     if(debugprint)print*,'sample l',VarName,' = ',1,sfcvxi(isa,jsa)
+     if(debugprint)print*,'sample l',VarName,' = ',1,sfcvxi(isa,jsa)
 
      
 !$omp parallel do private(i,j)
@@ -2846,12 +2679,6 @@ subroutine read_netcdf_3d_scatter(me,ncid,ifhr,im,jm,jsta,jsta_2l &
 
       if(me == 0) then
         iret = nf90_inq_varid(ncid,trim(varname),varid)
-        iret = nf90_get_att(ncid,varid,"_FillValue",fill_value)
-        if (iret /= 0) fill_value = spval_netcdf
-        !print*,stat,varname,varid
-        iret = nf90_get_var(ncid,varid,dummy2)
-!        iret = nf90_get_var(ncid,varid,dummy2,start=(/1,1,l,ifhr/), &
-!             count=(/im,jm,1,1/))
         if (iret /= 0) then
           print*,VarName," not found -Assigned missing values"
           do l=1,lm
@@ -2863,6 +2690,9 @@ subroutine read_netcdf_3d_scatter(me,ncid,ifhr,im,jm,jsta,jsta_2l &
           end do
           end do
         else
+          iret = nf90_get_att(ncid,varid,"_FillValue",fill_value)
+          if (iret /= 0) fill_value = spval_netcdf
+          iret = nf90_get_var(ncid,varid,dummy2)
           do l=1,lm
 !$omp parallel do private(i,j,jj)
           do j=1,jm
@@ -2906,12 +2736,6 @@ subroutine read_netcdf_2d_scatter(me,ncid,ifhr,im,jm,jsta,jsta_2l &
 
       if(me == 0) then
         iret = nf90_inq_varid(ncid,trim(varname),varid)
-        iret = nf90_get_att(ncid,varid,"_FillValue",fill_value)
-        if (iret /= 0) fill_value = spval_netcdf
-        !print*,stat,varname,varid
-        iret = nf90_get_var(ncid,varid,dummy2)
-        !iret = nf90_get_var(ncid,varid,dummy2,start=(/1,1,ifhr/), &
-        !     count=(/im,jm,1/))
         if (iret /= 0) then
           print*,VarName, " not found -Assigned missing values"
 !$omp parallel do private(i,j)
@@ -2921,6 +2745,9 @@ subroutine read_netcdf_2d_scatter(me,ncid,ifhr,im,jm,jsta,jsta_2l &
             end do
           end do
         else
+          iret = nf90_get_att(ncid,varid,"_FillValue",fill_value)
+          if (iret /= 0) fill_value = spval_netcdf
+          iret = nf90_get_var(ncid,varid,dummy2)
 !$omp parallel do private(i,j,jj)
           do j=1,jm
 !            jj=jm-j+1
diff --git a/sorc/ncep_post.fd/MAPSSLP.f b/sorc/ncep_post.fd/MAPSSLP.f
index 03e98fec5..6e7cc679c 100644
--- a/sorc/ncep_post.fd/MAPSSLP.f
+++ b/sorc/ncep_post.fd/MAPSSLP.f
@@ -10,7 +10,7 @@ SUBROUTINE MAPSSLP(TPRES)
 !
 !-----------------------------------------------------------------------
       use ctlblk_mod, only: jsta, jend, spl, smflag, lm, im, jsta_2l, jend_2u, &
-                            lsm, jm, grib
+                            lsm, jm, grib, spval
       use gridspec_mod, only: maptype, dxval
       use vrbls3d, only: pmid, t, pint
       use vrbls2d, only: pslp, fis
@@ -43,9 +43,12 @@ SUBROUTINE MAPSSLP(TPRES)
 !$omp parallel do private(i,j)
         DO J=JSTA,JEND
           DO I=1,IM
-            if(SPL(L) == 70000.)THEN
+            if(SPL(L) == 70000. .and. TPRES(I,J,L) <spval)THEN
               T700(i,j)  = TPRES(I,J,L) 
               TH700(I,J) = T700(I,J)*(P1000/70000.)**CAPA
+            else
+              T700(i,j)  = spval
+              TH700(I,J) = spval
             endif
           ENDDO
         ENDDO
@@ -79,6 +82,7 @@ SUBROUTINE MAPSSLP(TPRES)
 
        DO J=JSTA,JEND
          DO I=1,IM
+         if(T700(I,J) <spval) then
          T700(I,J) = TH700(I,J)*(70000./P1000)**CAPA
           IF (T700(I,J)>100.) THEN
            TSFCNEW = T700(I,J)*(PMID(I,J,LM)/70000.)**EXPo
@@ -90,6 +94,11 @@ SUBROUTINE MAPSSLP(TPRES)
               ((TSFCNEW+LAPSES*FIS(I,J)*GI)/TSFCNEW)**EXPINV
 !          print*,'PSLP(I,J),I,J',PSLP(I,J),I,J
            GRID1(I,J)=PSLP(I,J)
+         else
+           PSLP(I,J) = spval
+           grid1(I,J) = spval
+         endif
+
          ENDDO
        ENDDO
 
diff --git a/sorc/ncep_post.fd/MDL2P.f b/sorc/ncep_post.fd/MDL2P.f
index d08e91d4d..31de5ed59 100644
--- a/sorc/ncep_post.fd/MDL2P.f
+++ b/sorc/ncep_post.fd/MDL2P.f
@@ -3723,6 +3723,8 @@ SUBROUTINE MDL2P(iostatusD3D)
         IF(gridtype == 'A'.OR. gridtype == 'B') then                  
           if(me==0)PRINT*,'CALLING MEMSLP for A or B grid'
           CALL MEMSLP(TPRS,QPRS,FPRS)
+          if(me==0)PRINT*,'aft CALLING MEMSLP for A or B grid,pslp=', &
+            maxval(pslp(1:im,jsta:jend)),minval(pslp(1:im,jsta:jend)),pslp(im/2,(jsta+jend)/2)
         ELSE IF (gridtype == 'E')THEN
           if(me==0)PRINT*,'CALLING MEMSLP_NMM for E grid'
           CALL MEMSLP_NMM(TPRS,QPRS,FPRS)
@@ -3735,6 +3737,8 @@ SUBROUTINE MDL2P(iostatusD3D)
             GRID1(I,J) = PSLP(I,J)
           ENDDO
         ENDDO
+        print *,'inmdl2p,pslp=',maxval(pslp(1:im,jsta:jend)),minval(pslp(1:im,jsta:jend))
+        print *,'inmdl2p,point pslp=',pslp(im/2,(jsta+jend)/2),pslp(1,jsta),'cfld=',cfld
         if(grib == 'grib2')then
           cfld = cfld + 1
           fld_info(cfld)%ifld = IAVBLFLD(IGET(023))
diff --git a/sorc/ncep_post.fd/MDLFLD.f b/sorc/ncep_post.fd/MDLFLD.f
index dfe0430c0..80598d128 100644
--- a/sorc/ncep_post.fd/MDLFLD.f
+++ b/sorc/ncep_post.fd/MDLFLD.f
@@ -181,7 +181,8 @@ SUBROUTINE MDLFLD
 ! Set up logical flag to indicate whether model outputs radar directly
       Model_Radar = .false.
       IF (ABS(MAXVAL(REF_10CM)-SPVAL)>SMALL)Model_Radar=.True.
-      if(me==0)print*,'Did post read in model derived radar ref ',Model_Radar
+      if(me==0)print*,'Did post read in model derived radar ref ',Model_Radar, &
+        'MODELNAME=',trim(MODELNAME),'imp_physics=',imp_physics
       ALLOCATE(EL     (IM,JSTA_2L:JEND_2U,LM))     
       ALLOCATE(RICHNO (IM,JSTA_2L:JEND_2U,LM))
       ALLOCATE(PBLRI  (IM,JSTA_2L:JEND_2U))    
@@ -2714,8 +2715,10 @@ SUBROUTINE MDLFLD
           DO I=1,IM
             GRID1(I,J)=0.0
             DO L=1,NINT(LMH(I,J))
-              GRID1(I,J)=GRID1(I,J)+0.00344* &
-              (10.**(DBZ(I,J,L)/10.))**0.57143*(ZINT(I,J,L)-ZINT(I,J,L+1))/1000.
+              if(zint(i,j,l) < spval) then
+                GRID1(I,J)=GRID1(I,J)+0.00344* &
+                (10.**(DBZ(I,J,L)/10.))**0.57143*(ZINT(I,J,L)-ZINT(I,J,L+1))/1000.
+              endif
             ENDDO
           ENDDO
         ENDDO
@@ -3596,6 +3599,9 @@ SUBROUTINE MDLFLD
        DO J=JSTA,JEND
         DO I=1,IM
          LPBL(I,J)=LM
+
+         if(ZINT(I,J,NINT(LMH(I,J))+1) <spval) then
+
          ZSFC=ZINT(I,J,NINT(LMH(I,J))+1)
          loopL:DO L=NINT(LMH(I,J)),1,-1
           IF(MODELNAME=='RAPR') THEN
@@ -3611,6 +3617,10 @@ SUBROUTINE MDLFLD
            EXIT loopL 
           END IF
          ENDDO loopL
+
+         else
+           LPBL(I,J) = LM
+         endif
          if(lpbl(i,j)<1)print*,'zero lpbl',i,j,pblri(i,j),lpbl(i,j)
         ENDDO
        ENDDO
diff --git a/sorc/ncep_post.fd/MISCLN.f b/sorc/ncep_post.fd/MISCLN.f
index 6854dc9a5..9d80f393f 100644
--- a/sorc/ncep_post.fd/MISCLN.f
+++ b/sorc/ncep_post.fd/MISCLN.f
@@ -86,7 +86,7 @@ SUBROUTINE MISCLN
       use vrbls2d,    only: pblh, cprate
       use masks,      only: lmh
       use params_mod, only: d00, h99999, h100, h1, h1m12, pq0, a2, a3, a4,    &
-                            rhmin, rgamog, tfrz
+                            rhmin, rgamog, tfrz, small
       use ctlblk_mod, only: grib, cfld, fld_info, datapd, im, jsta, jend, jm,         &
                             nbnd, nbin_du, lm, htfd, spval, pthresh, nfd, petabnd, me,&
                             jsta_2l, jend_2u, MODELNAME
@@ -378,6 +378,8 @@ SUBROUTINE MISCLN
 !$omp parallel do private(i,j)
           DO J=JSTA,JEND
             DO I=1,IM
+
+              if(PMID(I,J,1)<spval) then
 ! INPUT
               CALL TPAUSE(LM,PMID(I,J,1:LM),UH(I,J,1:LM)             & 
 ! INPUT
@@ -386,6 +388,15 @@ SUBROUTINE MISCLN
                          ,P1D(I,J),U1D(I,J),V1D(I,J),T1D(I,J)        &
 ! OUTPUT
                          ,Z1D(I,J),SHR1D(I,J))                       ! OUTPUT
+              else
+                P1D(I,J) = spval
+                U1D(I,J) = spval
+                V1D(I,J) = spval
+                T1D(I,J) = spval
+                Z1D(I,J) = spval
+                SHR1D(I,J) = spval
+              endif
+
             END DO
           END DO
 !
@@ -551,12 +562,29 @@ SUBROUTINE MISCLN
 
           allocate(MAXWP(IM,jsta:jend), MAXWZ(IM,jsta:jend),         &
                    MAXWU(IM,jsta:jend), MAXWV(IM,jsta:jend),MAXWT(IM,jsta:jend))
+!$omp parallel do private(i,j)
+           DO J=JSTA,JEND
+            DO I=1,IM
+             MAXWP(I,J)=SPVAL
+             MAXWZ(I,J)=SPVAL
+             MAXWU(I,J)=SPVAL
+             MAXWV(I,J)=SPVAL
+            ENDDO
+           ENDDO
 
 !            CALL CALMXW(MAXWP,MAXWZ,MAXWU,MAXWV,MAXWT)
 ! Chuang: Use GFS algorithm per Iredell's and DiMego's decision on unification
 !$omp parallel do private(i,j)
           DO J=JSTA,JEND
-           DO I=1,IM
+           loopI:DO I=1,IM
+            DO L=1,LM
+              IF (ABS(PMID(I,J,L)-SPVAL)<=SMALL .OR. &
+                  ABS(UH(I,J,L)-SPVAL)<=SMALL .OR. &
+                  ABS(UH(I,J,L)-SPVAL)<=SMALL .OR. &
+                  ABS(VH(I,J,L)-SPVAL)<=SMALL .OR. &
+                  ABS(T(I,J,L)-SPVAL)<=SMALL .OR. &
+                  ABS(ZMID(I,J,L)-SPVAL)<=SMALL) cycle loopI
+            ENDDO
 ! INPUT
             CALL MXWIND(LM,PMID(I,J,1:LM),UH(I,J,1:LM)               &
 ! INPUT
@@ -565,7 +593,7 @@ SUBROUTINE MISCLN
                        ,MAXWP(I,J),MAXWU(I,J),MAXWV(I,J)             &
 ! OUTPUT
                        ,MAXWT(I,J),MAXWZ(I,J))
-           END DO
+           ENDDO loopI
           END DO 
 !        PRESSURE OF MAX WIND LEVEL
          IF (IGET(173) > 0) THEN
diff --git a/sorc/ncep_post.fd/NGMSLP.f b/sorc/ncep_post.fd/NGMSLP.f
index 928ea922f..56fdda56c 100644
--- a/sorc/ncep_post.fd/NGMSLP.f
+++ b/sorc/ncep_post.fd/NGMSLP.f
@@ -93,7 +93,7 @@ SUBROUTINE NGMSLP
       use vrbls2d,    only: slp, fis, z1000
       use masks,      only: lmh
       use params_mod, only: rd, gi, g, h1, d608, gamma, d50, p1000
-      use ctlblk_mod, only: jsta, jend, im, jm
+      use ctlblk_mod, only: jsta, jend, im, jm, spval
 !- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        implicit none
 !     
@@ -119,6 +119,9 @@ SUBROUTINE NGMSLP
        DO J=JSTA,JEND
        DO I=1,IM
          LLMH = NINT(LMH(I,J))
+
+         if( PINT(I,J,LLMH+1)<spval) then
+
          ZSFC = ZINT(I,J,LLMH+1)
          PSFC = PINT(I,J,LLMH+1)
          SLP(I,J) = PSFC
@@ -155,6 +158,12 @@ SUBROUTINE NGMSLP
          RHOAVG   = PAVG*GI/TAUAVG
          RRHOG    = H1/(RHOAVG*G)
          Z1000(I,J) = (SLP(I,J)-P1000)*RRHOG
+
+         else
+         SLP(I,J) = spval
+         Z1000(I,J) = spval
+         endif
+
 !     
 !     MOVE TO NEXT HORIZONTAL GRIDPOINT.
       ENDDO
diff --git a/sorc/ncep_post.fd/OTLFT.f b/sorc/ncep_post.fd/OTLFT.f
index 6c9a2b3ee..38de1b338 100644
--- a/sorc/ncep_post.fd/OTLFT.f
+++ b/sorc/ncep_post.fd/OTLFT.f
@@ -52,7 +52,7 @@ SUBROUTINE OTLFT(PBND,TBND,QBND,SLINDX)
       use vrbls2d,    only: T500
       use lookup_mod, only: THL, RDTH, JTB, QS0, SQS, RDQ, ITB, PTBL, &
                             PL, RDP, THE0, STHE, RDTHE, TTBL
-      use ctlblk_mod, only: JSTA, JEND, IM
+      use ctlblk_mod, only: JSTA, JEND, IM, spval
       use params_mod, only: D00, H10E5, CAPA, ELOCP, EPS, ONEPS
       use upp_physics, only: FPVSNEW
 !- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -92,6 +92,9 @@ SUBROUTINE OTLFT(PBND,TBND,QBND,SLINDX)
         DO I=1,IM
           TBT = TBND(I,J) 
           QBT = QBND(I,J)
+!
+          if( TBT < spval ) then
+
           APEBT = (H10E5/PBND(I,J))**CAPA
 !
 !--------------SCALING POTENTIAL TEMPERATURE & TABLE INDEX--------------
@@ -232,6 +235,10 @@ SUBROUTINE OTLFT(PBND,TBND,QBND,SLINDX)
            QSATP=EPS*ESATP/(P500-ESATP*ONEPS)
            TVP=PARTMP*(1+0.608*QSATP)
            SLINDX(I,J)=T500(I,J)-TVP
+
+           else
+             SLINDX(I,J)=spval
+           endif
          END DO
        END DO
 !     
diff --git a/sorc/ncep_post.fd/OTLIFT.f b/sorc/ncep_post.fd/OTLIFT.f
index 9e911d846..f1abe6575 100644
--- a/sorc/ncep_post.fd/OTLIFT.f
+++ b/sorc/ncep_post.fd/OTLIFT.f
@@ -47,7 +47,7 @@ SUBROUTINE OTLIFT(SLINDX)
       use masks,      only: LMH
       use lookup_mod, only: THL, RDTH, JTB, QS0, SQS, RDQ,ITB, PTBL, PL, &
                             RDP, THE0, STHE, RDTHE, TTBL
-      use ctlblk_mod, only: JSTA, JEND, IM
+      use ctlblk_mod, only: JSTA, JEND, IM, SPVAL
       use params_mod, only: D00,H10E5, CAPA, ELOCP, EPS, ONEPS
       use upp_physics, only: FPVSNEW
 !
@@ -85,6 +85,7 @@ SUBROUTINE OTLIFT(SLINDX)
       DO J=JSTA,JEND
         DO I=1,IM
           LBTM=NINT(LMH(I,J))
+          IF(T(I,J,LBTM)<SPVAL .AND. Q(I,J,LBTM)<SPVAL) THEN
           TBT = T(I,J,LBTM)
           QBT = Q(I,J,LBTM)
           APEBT = (H10E5/PMID(I,J,LBTM))**CAPA
@@ -196,6 +197,7 @@ SUBROUTINE OTLIFT(SLINDX)
          QSATP=EPS*ESATP/(P500-ESATP*ONEPS)
          TVP=PARTMP*(1+0.608*QSATP)
          SLINDX(I,J)=T500(I,J)-TVP
+        ENDIF !end T(I,J,LBTM)<SPVAL 
         ENDDO
       ENDDO
 !       write(*,*) ' in otlift t500 partmp ',t500(1,1),partmp(1,1)
diff --git a/sorc/ncep_post.fd/SLP_new.f b/sorc/ncep_post.fd/SLP_new.f
index 5e571ab6c..bb72ab737 100644
--- a/sorc/ncep_post.fd/SLP_new.f
+++ b/sorc/ncep_post.fd/SLP_new.f
@@ -125,6 +125,9 @@ SUBROUTINE MEMSLP(TPRES,QPRES,FIPRES)
 !$omp parallel do private(j,i,psfc,pchk)
         DO J=JSTA,JEND
           DO I=1,IM
+
+           if(PSLP(I,J)<spval) then
+
             PSFC = PSLP(I,J)
             PCHK = PSFC
             IF(NFILL > 0) THEN
@@ -151,6 +154,9 @@ SUBROUTINE MEMSLP(TPRES,QPRES,FIPRES)
 !	      END IF
 !	    END IF  
 !           if(i==ii.and.j==jj)print*,'Debug: HTMO= ',HTMO(I,J,L)
+
+           endif  !if pslp
+
           ENDDO
         ENDDO
 !
@@ -167,7 +173,9 @@ SUBROUTINE MEMSLP(TPRES,QPRES,FIPRES)
 
         DO J=JSTA,JEND
           DO I=1,IM
+           if(PSLP(I,J)<spval) then
             IF(HTMO(I,J,L) < 0.5) CYCLE LOOP210
+           endif
           ENDDO
         ENDDO
         LHMNT = L+1
@@ -198,6 +206,7 @@ SUBROUTINE MEMSLP(TPRES,QPRES,FIPRES)
 !       DO 240 J=JSTA_M2,JEND_M2
         DO J=JSTA_M,JEND_M
           DO I=2,IM-1
+           if(PSLP(I,J)<spval) then
             KOUNT = KOUNT + 1
             IMNT(KOUNT,L) = 0
             JMNT(KOUNT,L) = 0
@@ -205,6 +214,7 @@ SUBROUTINE MEMSLP(TPRES,QPRES,FIPRES)
             KMN         = KMN + 1
             IMNT(KMN,L) = I
             JMNT(KMN,L) = J
+           endif
           enddo
         enddo
         KMNTM(L) = KMN
@@ -228,8 +238,10 @@ SUBROUTINE MEMSLP(TPRES,QPRES,FIPRES)
           DO I=1,IM
 ! dong
 !            if (QPRES(I,J,LSM) < spval) then 
+           if(PSLP(I,J)<spval) then
             TTV(I,J)   = TPRES(I,J,L)
             HTM2D(I,J) = HTMO(I,J,L)
+           end if ! spval if
 !            end if ! spval if
 !     IF(TTV(I,J)<150. .and. TTV(I,J)>325.0)print*                &  
 !       ,'abnormal IC for T relaxation',i,j,TTV(I,J)
@@ -244,8 +256,8 @@ SUBROUTINE MEMSLP(TPRES,QPRES,FIPRES)
 !$omp parallel do private(i,j,tem)
         DO J=JSTA_M,JEND_M
           DO I=2,IM-1
-! dong
-            if (QPRES(I,J,LSM) < spval) then 
+
+           if(PSLP(I,J)<spval) then
 
 !HC        IF(HTM2D(I,J,L)>0.5.AND.
 !HC     1     HTM2D(I+IHW(J),J-1,L)*HTM2D(I+IHE(J),J-1,L)
@@ -260,7 +272,7 @@ SUBROUTINE MEMSLP(TPRES,QPRES,FIPRES)
               TTV(I,J) = TPRES(I,J,L)*(1.+0.608*QPRES(I,J,L))
             ENDIF
 !           if(i==ii.and.j==jj)print*,'Debug:L,TTV B SMOO= ',l,TTV(I,J) 
-            end if ! spval
+           end if ! spval
           ENDDO
         ENDDO
 !
@@ -274,9 +286,8 @@ SUBROUTINE MEMSLP(TPRES,QPRES,FIPRES)
           DO KM=1,KMM
             I = IMNT(KM,L)
             J = JMNT(KM,L)
-! dong
-!            if (QPRES(I,J,LSM) < spval) then 
 
+            if(PSLP(I,J)<spval) then
 
 !HC      TTV(I,J)=AD05*(4.*(TTV(I+IHW(J),J-1)+TTV(I+IHE(J),J-1)
 !HC     1                  +TTV(I+IHW(J),J+1)+TTV(I+IHE(J),J+1))
@@ -338,7 +349,8 @@ SUBROUTINE MEMSLP(TPRES,QPRES,FIPRES)
 !     if(i==ii.and.j==jj)print*,'Debug: L,TTV A S'
 !    1,l,TTV(I,J),N
 !     1,l,TNEW(I,J),N
-!            end if ! spval
+
+           end if ! spval
 
           enddo
 !
@@ -346,9 +358,8 @@ SUBROUTINE MEMSLP(TPRES,QPRES,FIPRES)
           DO KM=1,KMM
             I = IMNT(KM,L)
             J = JMNT(KM,L)
-! dong
-            if (QPRES(I,J,LSM) < spval)  then
-            TTV(I,J) = TNEW(I,J)
+            if(PSLP(I,J)<spval .and. TNEW(I,J)< SPVAL/100.) then
+              TTV(I,J) = TNEW(I,J)
             end if ! spval
           END DO
         END DO              ! NRLX loop
@@ -358,8 +369,7 @@ SUBROUTINE MEMSLP(TPRES,QPRES,FIPRES)
           I = IMNT(KM,L)
           J = JMNT(KM,L)
 
-! dong
-          if (QPRES(I,J,LSM) < spval) then 
+          if(PSLP(I,J)<spval) then
 
 ! dong try to fix missing value for hgtprs at 1000 mb
           TPRES(I,J,L) = TTV(I,J)
@@ -389,9 +399,7 @@ SUBROUTINE MEMSLP(TPRES,QPRES,FIPRES)
       DO J=JSTA,JEND
         DO I=1,IM
 
-! dong
-!          if (QPRES(I,J,LSM) < spval) then 
-
+         if(PSLP(I,J)<spval) then
 !         P1(I,J)=SPL(NINT(LMH(I,J)))
 !         DONE(I,J)=.FALSE.
 
@@ -418,7 +426,7 @@ SUBROUTINE MEMSLP(TPRES,QPRES,FIPRES)
             END DO
           ENDIF
 
-!          end if ! spval
+         end if ! spval
 
         ENDDO
       ENDDO
@@ -428,8 +436,8 @@ SUBROUTINE MEMSLP(TPRES,QPRES,FIPRES)
 LOOP320:DO KM=1,KMM
         I = IMNT(KM,LSM)
         J = JMNT(KM,LSM)
-! dong
-!        if (QPRES(I,J,LSM) < spval) then 
+
+        if(PSLP(I,J)<spval) then
 
         IF(DONE(I,J)) cycle
         LMHIJ   = LMHO(I,J)
@@ -462,7 +470,7 @@ SUBROUTINE MEMSLP(TPRES,QPRES,FIPRES)
 !     if(i==ii.and.j==jj)print*,'Debug:spl,FI,TLYR,PSLPA3='   &
 !         ,spl(lp),FIPRES(I,J,LP),TLYR,PSLP(I,J)       
 !HC EXPERIMENT
-!       end if ! spval
+       end if ! spval
 
 ENDDO LOOP320
  320  CONTINUE
@@ -487,8 +495,7 @@ SUBROUTINE MEMSLP(TPRES,QPRES,FIPRES)
       DO J=JSTA,JEND
         DO I=1,IM
 
-! dong
-!          if (QPRES(I,J,LSM) < spval) then 
+         if(PSLP(I,J)<spval) then
 
 !         if(i==ii.and.j==jj)print*,'Debug: with 330 loop'
           IF(DONE(I,J)) cycle
@@ -525,7 +532,7 @@ SUBROUTINE MEMSLP(TPRES,QPRES,FIPRES)
           END IF
           DONE(I,J) = .TRUE.
           KOUNT     = KOUNT + 1
-!          end if ! spval
+         end if ! spval
 
         enddo
       enddo
diff --git a/sorc/ncep_post.fd/WRFPOST.f b/sorc/ncep_post.fd/WRFPOST.f
index f674a2ba6..ec422fb39 100644
--- a/sorc/ncep_post.fd/WRFPOST.f
+++ b/sorc/ncep_post.fd/WRFPOST.f
@@ -769,9 +769,11 @@ PROGRAM WRFPOST
             CALL INITPOST_NMM
           ELSE IF (MODELNAME == 'FV3R') THEN
 ! use netcdf library to read output directly
+            spval = 9.99e20
             print*,'CALLING INITPOST_NETCDF'
             CALL INITPOST_NETCDF(ncid3d)
           ELSE IF (MODELNAME == 'GFS') THEN
+            spval = 9.99e20
             print*,'CALLING INITPOST_GFS_NETCDF'
             CALL INITPOST_GFS_NETCDF(ncid3d)
           ELSE
@@ -780,6 +782,7 @@ PROGRAM WRFPOST
           END IF
 ! use netcdf_parallel library to read fv3 output
         ELSE IF(TRIM(IOFORM) == 'netcdfpara') THEN
+          spval = 9.99e20
           print*,'CALLING INITPOST_GFS_NETCDF_PARA'
           CALL INITPOST_GFS_NETCDF_PARA(ncid3d)
         ELSE IF(TRIM(IOFORM) == 'binarympiio') THEN 
diff --git a/tests/compile_upp.sh b/tests/compile_upp.sh
index afd3b7f0b..94360f243 100755
--- a/tests/compile_upp.sh
+++ b/tests/compile_upp.sh
@@ -8,7 +8,7 @@ set -x
 module purge
 
 hostname
-source detect_machine.sh
+source ./detect_machine.sh
 if [[ $(uname -s) == Darwin ]]; then
   readonly MYDIR=$(cd "$(dirname "$(greadlink -f -n "${BASH_SOURCE[0]}" )" )" && pwd -P)
 else