From 5052029e0f4bc184b57679699138990f584f4f54 Mon Sep 17 00:00:00 2001
From: Baoyu Yin <Baoyu.Yin@noaa.gov>
Date: Wed, 25 Feb 2015 14:13:53 -0500
Subject: [PATCH 1/2] VLab Issue #6619 - AWIPS2_DCS_14537 GFE Add parameters to
 RUC13 parameterinfo file; fixes #6619

Change-Id: I13b350ee4f5685a723f78473d07003683b058e68

Former-commit-id: b28cfa863daf9e156855791c4d015dfe5a379c27
---
 .../base/parameter/alias/gfeParamName.xml        |  2 ++
 .../base/grid/parameterInfo/ruc130.xml           | 16 ++++++++++++++++
 .../base/parameter/definition/parameters.xml     |  7 ++++++-
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/parameter/alias/gfeParamName.xml b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/parameter/alias/gfeParamName.xml
index 0596da7b7c..37660c460b 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/parameter/alias/gfeParamName.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/parameter/alias/gfeParamName.xml
@@ -8,6 +8,7 @@
   Mar 31, 2014    #2934    dgilling    Updated params for pSurge2.0/PHISH data.
   Jul 03, 2014  DR 14068   mfoster     Added parameters for 3km AK-RTMA
   Dec 15, 2014  DR 14024   jwatson     Added parameters for 2.5km GFSLAMPGrid
+  Feb 24, 2015  DR 16671   byin        Added HPBL for RUC13
  -->
 <aliasList caseSensitive="true" namespace="gfeParamName">
     <alias base="AV">av</alias>
@@ -36,6 +37,7 @@
     <alias base="HAILPROB">hailprob</alias>
     <alias base="Heli">heli</alias>
     <alias base="HIdx">hidx</alias>
+    <alias base="HPBL">hpbl</alias>
     <alias base="HTSGW">htsgw</alias>
     <alias base="KI">ki</alias>
     <alias base="LgSP3hr">lgsp3hr</alias>
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ruc130.xml b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ruc130.xml
index d5efd42c9d..1767c0c2c6 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ruc130.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ruc130.xml
@@ -2,6 +2,7 @@
 <!--
   Mar 20, 2013    #1774    randerso    Added forecast hours out to 18
   Jun 19, 2013    #2044    randerso    Updated to match model
+  Feb 24 20153    DCS14537 byin        Added HPBL for RUC13
  -->
 <gridParamInfo xmlns:ns2="group">
   <valtimeMINUSreftime>
@@ -729,4 +730,19 @@
       <level>FHAG06000</level>
     </levels>
   </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>hpbl</short_name>
+    <long_name>Height of Planetary Boundary Layer</long_name>
+    <units>m</units>
+    <udunits>meter</udunits>
+    <uiname>HPBL</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>4000.0</valid_range>
+    <fillValue>-99999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
 </gridParamInfo>
diff --git a/edexOsgi/com.raytheon.uf.common.parameter/utility/common_static/base/parameter/definition/parameters.xml b/edexOsgi/com.raytheon.uf.common.parameter/utility/common_static/base/parameter/definition/parameters.xml
index b0b9214d59..c149a39246 100755
--- a/edexOsgi/com.raytheon.uf.common.parameter/utility/common_static/base/parameter/definition/parameters.xml
+++ b/edexOsgi/com.raytheon.uf.common.parameter/utility/common_static/base/parameter/definition/parameters.xml
@@ -154,6 +154,11 @@
 		<abbreviation>HCDC</abbreviation>
 		<unit>%</unit>
 	</parameter>
+        <parameter>
+                <name>Height of Planetary Boundary Layer</name>
+                <abbreviation>HPBL</abbreviation>
+                <unit>m</unit>
+        </parameter>
 	<parameter>
 		<name>Humidity Mixing Ratio</name>
 		<abbreviation>MIXR</abbreviation>
@@ -579,4 +584,4 @@
 		<abbreviation>DIRC</abbreviation>
 		<unit>degree</unit>
 	</parameter>
-</parameterList>
\ No newline at end of file
+</parameterList>

From c5344f3481e5048b2cecd973856d5a9b094d1a5c Mon Sep 17 00:00:00 2001
From: Baoyu Yin <Baoyu.Yin@noaa.gov>
Date: Wed, 25 Feb 2015 14:55:28 -0500
Subject: [PATCH 2/2] VLab Issue #6620 - AWIPS2_DR_16692 GFE GUM RTMA missing
 baseline configuration; fixes #6620

Change-Id: I813e7b37a6abcbbd6de6767d360ec5a8c26641e5

Former-commit-id: 12ce2ed059d34d758e47774e0feff593146409e2
---
 .../utility/edex_static/base/config/gfe/serverConfig.py     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
index 4e7939d12f..cb8205b91a 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
@@ -50,6 +50,7 @@
 #    01/13/2015          #3955     randerso       Added definitions for NewTerrain database
 #                                                 Added Topo to ISCPARMS
 #    01/19/2015          #4014     dgilling       Added ETSS. 
+#    02/24/2015          #16692    byin           Added RTMA. Removed gfsLR and GWW233
 ########################################################################
 
 #----------------------------------------------------------------------------
@@ -1230,14 +1231,13 @@ elif SID == "SJU":
 
 # Guam OCONUS
 elif SID == "GUM":
-    D2DMODELS = [('MRF204', 'gfsLR'),
-                 ('AVN225', 'GFS75'),
-                 'GWW233',
+    D2DMODELS = [('AVN225', 'GFS75'),
                  'GlobalWave',
                  ('TPCWindProb', 'TPCProb'),
                  'RTOFS-Guam',
                  'WPHwave10',
                  'GLOBHwave',
+                 ('Guam-RTMA','RTMA'),
                  ('nwpsCG1', 'nwpsCG1'),
                  ('nwpsTrkngCG0', 'nwpsTrkngCG0'),
                  ('GFS20-PAC', 'GFS20'),