From 7db813d59c95aa1bb7c5d3dc56f13c985672592f Mon Sep 17 00:00:00 2001
From: Melissa Porricel <Melissa.Porricelli@noaa.gov>
Date: Mon, 16 Mar 2015 14:42:53 -0400
Subject: [PATCH] ASM #7951 - Add Capabilities for CONUS RTMA at 2.5km

Change-Id: Iab79fc17b3b648ffa39c8385c581392e3cf58f9c

Former-commit-id: 9c7d466213eaac3a46fddf416967d00e3446bfee
---
 .../volumebrowser/VbSources/sfcGrid.xml            |  2 +-
 .../base/grid/datasetInfo/gribDatasets_NCEP-7.xml  |  8 ++++----
 .../base/grib/models/gribModels_NCEP-7.xml         | 14 ++------------
 .../edex_static/base/grib/subgrids/RTMA25Clip.xml  | 11 +++++++++++
 .../base/derivedParameters/definitions/MnT.xml     |  2 +-
 .../base/derivedParameters/definitions/MxT.xml     |  2 +-
 .../common_static/base/purge/gridPurgeRules.xml    |  5 +++++
 .../Installer.ldm/patch/etc/pqact.conf.template    |  4 ++++
 8 files changed, 29 insertions(+), 19 deletions(-)
 create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/subgrids/RTMA25Clip.xml

diff --git a/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/sfcGrid.xml b/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/sfcGrid.xml
index 177d7f93ec..8f122beac0 100644
--- a/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/sfcGrid.xml
+++ b/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/sfcGrid.xml
@@ -79,7 +79,7 @@
     <vbSource key="RFCqpf" category="SfcGrid" views="PLANVIEW TIMESERIES" />
     <vbSource key="RTGSST" category="SfcGrid" views="PLANVIEW TIMESERIES" />
     <vbSource key="RTGSSTHR" category="SfcGrid" views="PLANVIEW TIMESERIES" />
-    <vbSource key="RTMA" category="SfcGrid" views="PLANVIEW TIMESERIES" />
+    <vbSource key="RTMA25" category="SfcGrid" views="PLANVIEW TIMESERIES" />
     <vbSource key="RTOFS-GulfMexico" category="SfcGrid/RTOFS/forecast"
         subCategory="Atlantic" views="PLANVIEW TIMESERIES" />
     <vbSource key="RTOFS-GulfStream" category="SfcGrid/RTOFS/forecast"
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_NCEP-7.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_NCEP-7.xml
index 257dd833bc..362c20e288 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_NCEP-7.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_NCEP-7.xml
@@ -387,8 +387,8 @@
         <dt>1</dt>
     </info>
     <info>
-        <title>RTMA-Mosaic</title>
-        <datasetId>RTMA-Mosaic</datasetId>
+        <title>RTMA</title>
+        <datasetId>RTMA25</datasetId>
         <dt>1</dt>
     </info>
     <info>
@@ -697,8 +697,8 @@
         <dt>1</dt>
     </info>
     <info>
-        <title>RTMA-Mosaic</title>
-        <datasetId>RTMA-Mosaic</datasetId>
+        <title>RTMA</title>
+        <datasetId>RTMA25</datasetId>
         <dt>1</dt>
     </info>
     <info>
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
index 19b6919f41..127ac2e2eb 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
@@ -1103,7 +1103,7 @@
 	</model>
 
 	<model>
-		<name>RTMA-Mosaic</name>
+		<name>RTMA25</name>
 		<center>7</center>
 		<subcenter>0</subcenter>
 		<grid>184</grid>
@@ -2525,17 +2525,7 @@
 	</model>
 
 	<model>
-		<name>RTMA2P5KM</name>
-		<center>7</center>
-		<subcenter>4</subcenter>
-		<grid>1971</grid>
-		<process>
-			<id>109</id>
-		</process>
-	</model>
-
-	<model>
-		<name>RTMA-Mosaic</name>
+		<name>RTMA25</name>
 		<center>7</center>
 		<subcenter>4</subcenter>
 		<grid>184</grid>
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/subgrids/RTMA25Clip.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/subgrids/RTMA25Clip.xml
new file mode 100644
index 0000000000..c08bcfe374
--- /dev/null
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/subgrids/RTMA25Clip.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<subGridDef>
+  <modelNames>RTMA25</modelNames>
+  <referenceGrid>184</referenceGrid>
+  <nx>500</nx>
+  <ny>500</ny>
+  <!--
+  <centerLatitude>36.5</centerLatitude>
+  <centerLongitude>-81</centerLongitude>
+  -->
+</subGridDef>
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/MnT.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/MnT.xml
index 8d433eb6f3..bf1ef036d9 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/MnT.xml
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/MnT.xml
@@ -22,7 +22,7 @@
     <Method name="Alias" levels="Surface">
     	<Field abbreviation="MnT" level="2FHAG"/>
     </Method>
-    <Method name="Min" levels="Surface" models="RTMA">
+    <Method name="Min" levels="Surface" models="RTMA25">
     	<Field abbreviation="T24hr"/>
     </Method>
 </DerivedParameter>
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/MxT.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/MxT.xml
index c1c2f64de8..218a3cbb18 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/MxT.xml
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/MxT.xml
@@ -22,7 +22,7 @@
     <Method name="Alias" levels="Surface">
     	<Field abbreviation="MxT" level="2FHAG"/>
     </Method>
-    <Method name="Max" levels="Surface" models="RTMA">
+    <Method name="Max" levels="Surface" models="RTMA25">
     	<Field abbreviation="T24hr"/>
     </Method>
 </DerivedParameter>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
index b387c541de..935b615aef 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
@@ -517,6 +517,11 @@
 		<versionsToKeep>24</versionsToKeep>
 		<modTimeToWait>00-00:15:00</modTimeToWait>
 	</rule>
+	<rule>
+		<keyValue>RTMA25</keyValue>
+		<versionsToKeep>24</versionsToKeep>
+		<modTimeToWait>00-00:15:00</modTimeToWait>
+	</rule>	
 	<!-- Purge rule for AK-RTMA-3KM analysis -->
 	<rule>
 		<keyValue>AK-RTMA3</keyValue>
diff --git a/rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template b/rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
index 7b12c7f522..34d19762c4 100644
--- a/rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
+++ b/rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
@@ -795,4 +795,8 @@ NGRID	^(E[EHC][IP][A-Z]88) (KWBM) (..)(..)(..)
 # HRRR Workaround until noaaport ingest grib tables are updated.
 NGRID	^(Y.C[A-MZ][05789][0-9]) (KWBY) (..)(..)(..)
 	FILE	-overwrite -log -close -edex	/data_store/grib2/(\3:yyyy)(\3:mm)\3/\4/HRRR/GRID184/\1_\2_\3\4\5_(seq).grib2.%Y%m%d%H
+
+# RTMA 2.5km
+NGRID	^(L.IA98) (KWBR) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*)
+	FILE	-overwrite -log -close -edex	/data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H
 #