From cb8412642e89526e848c595df32925499859b075 Mon Sep 17 00:00:00 2001
From: David Friedman <David.Friedman@noaa.gov>
Date: Mon, 18 Jul 2016 18:45:22 +0000
Subject: [PATCH] ASM #19174 - EDEX grid decoder stores grids with incorrect
 name due to bad or mismatched grid definition files (additional check in for
 MSR QPE)

Change-Id: I22006cc3e8333cf7564c7d66b2b5687eb880168b
---
 .../base/grib/grids/MRMS-1km-CONUS.xml        |  4 +--
 .../edex_static/base/grib/grids/QPE-MSR.xml   | 36 +++++++++++++++++++
 .../base/grib/models/gribModels_RFC-9.xml     |  2 +-
 3 files changed, 39 insertions(+), 3 deletions(-)
 create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/QPE-MSR.xml

diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/MRMS-1km-CONUS.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/MRMS-1km-CONUS.xml
index 78165cc470..864fe31d5f 100755
--- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/MRMS-1km-CONUS.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/MRMS-1km-CONUS.xml
@@ -2,8 +2,8 @@
 <latLonGridCoverage>
     <name>10000</name>
     <description>CONUS domain for MRMS 1km products</description>
-    <la1>55</la1>
-    <lo1>230</lo1>
+    <la1>54.995</la1>
+    <lo1>230.005</lo1>
     <firstGridPointCorner>UpperLeft</firstGridPointCorner>
     <nx>7000</nx>
     <ny>3500</ny>
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/QPE-MSR.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/QPE-MSR.xml
new file mode 100644
index 0000000000..19f87a1aa1
--- /dev/null
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/QPE-MSR.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<polarStereoGridCoverage>
+    <name>250157</name>
+    <description>QPF Grid for MSR (North Central RFC Chanhassen, Minnesota)</description>
+    <la1>37.889</la1>
+    <lo1>-105.492</lo1>
+    <firstGridPointCorner>LowerLeft</firstGridPointCorner>
+    <nx>450</nx>
+    <ny>350</ny>
+    <dx>4.7625</dx>
+    <dy>4.7625</dy>
+    <spacingUnit>km</spacingUnit>
+    <minorAxis>6371229.0</minorAxis>
+    <majorAxis>6371229.0</majorAxis>
+    <lov>-105.0</lov>
+    <lad>60</lad>
+</polarStereoGridCoverage>
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_RFC-9.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_RFC-9.xml
index 9186a97899..b06e3ce7f9 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_RFC-9.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_RFC-9.xml
@@ -810,7 +810,7 @@
 		<name>QPE-MSR</name>
 		<center>9</center>
 		<subcenter>157</subcenter>
-		<grid>240157</grid>
+		<grid>250157</grid>
 		<process>
 			<id>152</id>
 		</process>