From c612c1c5377675acfcfa5379f25cc4fe01a6934a Mon Sep 17 00:00:00 2001
From: Joshua Watson <Joshua.Watson@noaa.gov>
Date: Thu, 25 Jun 2015 16:07:20 -0400
Subject: [PATCH] VLab Issue #8490 - Add HPC Day 6-7 QPF; fixes #8490

Change-Id: Iab8c7f598baa521c6fc814fe5da0287c47e2fb97

Former-commit-id: 7eb9c288e363533d55cd4c453710e2fe0da4b2ce
---
 .../bundles/ncepHydro/hpc/HPCqpfNDFD.xml      | 52 +++++++++++++++++++
 .../menus/ncepHydro/hpc/baseHPC.xml           |  6 ++-
 .../menus/ncepHydro/hpc/hpcMenus.xml          | 35 +++++++++++--
 .../menus/ncepHydro/hpc/precipitation.xml     |  6 ++-
 .../derivedParameters/definitions/TP168hr.xml | 32 ++++++++++++
 .../derivedParameters/definitions/TP72hr.xml  | 38 ++++++++++++++
 .../base/styleRules/d2dContourStyleRules.xml  |  4 +-
 .../base/styleRules/gridImageryStyleRules.xml |  8 +--
 8 files changed, 168 insertions(+), 13 deletions(-)
 create mode 100644 cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/hpc/HPCqpfNDFD.xml
 create mode 100755 edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TP168hr.xml
 create mode 100644 edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TP72hr.xml

diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/hpc/HPCqpfNDFD.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/hpc/HPCqpfNDFD.xml
new file mode 100644
index 0000000000..863ee7cd68
--- /dev/null
+++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/hpc/HPCqpfNDFD.xml
@@ -0,0 +1,52 @@
+<?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. -->
+<bundle>
+	<displayList>
+		<displays xsi:type="d2DMapRenderableDisplay"
+			xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+			<descriptor xsi:type="mapDescriptor">
+				<resource>
+					<loadProperties xsi:type="gridLoadProperties"
+						displayType="CONTOUR" loadWithoutData="false">						
+						<capabilities>
+							<capability xsi:type="outlineCapability" lineStyle="SOLID"
+								outlineOn="true" outlineWidth="1" />
+						</capabilities>
+					</loadProperties>
+					<properties renderingOrderId="CONTOUR" isSystemResource="false"
+						isBlinking="false" isMapLayer="false" isHoverOn="false" isVisible="true">
+						<pdProps maxDisplayWidth="100000000" minDisplayWidth="0" />
+					</properties>
+					<resourceData xsi:type="gridResourceData"
+						retrieveData="true" isUpdatingOnMetadataOnly="false"
+						isRequeryNecessaryOnTimeMatch="true">
+						<metadataMap>
+							<mapping key="info.parameter.abbreviation">
+								<constraint constraintValue="${param}" constraintType="IN" />
+							</mapping>
+							<mapping key="info.datasetId">
+								<constraint constraintValue="HPCqpfNDFD"
+									constraintType="EQUALS" />
+							</mapping>
+							<mapping key="info.level.leveltwovalue">
+								<constraint constraintValue="-999999" constraintType="EQUALS" />
+							</mapping>
+							<mapping key="pluginName">
+								<constraint constraintValue="grid" constraintType="EQUALS" />
+							</mapping>
+
+						</metadataMap>
+						<alertParser xsi:type="dataCubeAlertMessageParser" />
+					</resourceData>
+				</resource>
+			<numberOfFrames>${frameCount}</numberOfFrames>
+			</descriptor>
+		</displays>
+	</displayList>
+</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/hpc/baseHPC.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/hpc/baseHPC.xml
index 554c629687..a677b67a17 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/hpc/baseHPC.xml
+++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/hpc/baseHPC.xml
@@ -20,10 +20,12 @@
     -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
- 	<contribute xsi:type="bundleItem" file="bundles/ncepHydro/hpc/HPC6hrQPF.xml" 
+ 	<contribute xsi:type="bundleItem" file="bundles/ncepHydro/hpc/HPCqpfNDFD.xml" 
               menuText="HPC QPF 6hr (Grid)" id="HPCQPF6hr">
+              <substitute key="frameCount" value="2" />
+              <substitute key="param" value="tpHPCndfd" />
     </contribute>
 
     <contribute xsi:type="subinclude" fileName="menus/ncepHydro/hpc/hpcMenus.xml"/>
 
-</menuTemplate>
\ No newline at end of file
+</menuTemplate>
diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/hpc/hpcMenus.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/hpc/hpcMenus.xml
index 5a1365e067..10b279acee 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/hpc/hpcMenus.xml
+++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/hpc/hpcMenus.xml
@@ -11,8 +11,10 @@
 			<substitute key="wmo" value="PEI745" />
 		</contribute>
 		<contribute xsi:type="bundleItem"
-			file="bundles/ncepHydro/hpc/HPCqpfNDFD-PPFFG.xml" menuText="1-3 Day Excessive Rainfall (Grid)"
+			file="bundles/ncepHydro/hpc/HPCqpfNDFD.xml" menuText="1-3 Day Excessive Rainfall (Grid)"
 			id="day1to3ExcessiveRainfall">
+                        <substitute key="frameCount" value="3" />
+                        <substitute key="param" value="PPFFG" />
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/Redbook_customLegend.xml"
 			menuText="Precip Accum - 6 hr" id="precipAccum6hr">
@@ -90,10 +92,30 @@
 			</contribute>
 		</contribute>
 		<contribute xsi:type="separator" id="separator2" />
+		<contribute xsi:type="bundleItem"
+			file="bundles/ncepHydro/hpc/HPCqpfNDFD.xml" menuText="Day 1-3 HPC QPF Total (Grid)"
+			id="oneTo3HPCQPF">
+			<substitute key="frameCount" value="1" />
+			<substitute key="param" value="TP72hr" />
+		</contribute>
+		<contribute xsi:type="bundleItem"
+			file="bundles/ncepHydro/hpc/HPCqpfNDFD.xml" menuText="Day 1-5 HPC QPF Total (Grid)"
+			id="oneTo5HPCQPF">
+			<substitute key="frameCount" value="1" />
+			<substitute key="param" value="TP120hr" />
+		</contribute>
+		<contribute xsi:type="bundleItem"
+			file="bundles/ncepHydro/hpc/HPCqpfNDFD.xml" menuText="Day 1-7 HPC QPF Total (Grid)"
+			id="oneTo7HPCQPF">
+			<substitute key="frameCount" value="1" />
+			<substitute key="param" value="TP168hr" />
+		</contribute>
+		<!-- 
 		<contribute xsi:type="bundleItem" file="bundles/Redbook.xml"
 			menuText="1-5 Day Total Precip" id="oneToFiveDayTotalPrecip">
 			<substitute key="wmo" value="PEIO46" />
 		</contribute>
+		 -->
 		<contribute xsi:type="bundleItem" file="bundles/Redbook.xml"
 			menuText="6-10, 8-14 Day Precip Anom" id="sixToTen8to14DayPrecipAnom">
 			<substitute key="wmo" value="PEIY47, PETT00" />
@@ -112,11 +134,11 @@
 			<substitute key="wmo"
 				value="PENV01,PENV02,PENV03,PENV04,PENV05,PENV06,PENV07,PENV08,PENV09,PENV10,PENV11,PENV12,PENV13" />
 		</contribute>
-
+		<!--
 		<contribute xsi:type="separator" id="separator3" />
-
+		 
 		<contribute xsi:type="bundleItem"
-			file="bundles/ncepHydro/hpc/HPCqpfNDFD6hr.xml" menuText="1-3 Day HPC QPF (6-Hourly Grid)"
+			file="bundles/ncepHydro/hpc/HPCqpfNDFD6hr.xml" menuText="1-3 Day HPC QPF Total (Grid)"
 			id="oneTo3HPCQPF">
 		</contribute>
 		<contribute xsi:type="bundleItem"
@@ -127,6 +149,9 @@
 			file="bundles/ncepHydro/hpc/HPCqpfNDFD120hr.xml" menuText="1-5 Day HPC QPF Total (Grid)"
 			id="oneTo5HPCQPF">
 		</contribute>
+		 -->
+
+		
 	</contribute>
 
 	<contribute xsi:type="subMenu" menuText="Temps &amp;&amp; Weather"
@@ -203,4 +228,4 @@
 			<substitute key="wmo" value="PSAO72" />
 		</contribute>
 	</contribute>
-</menuTemplate>
\ No newline at end of file
+</menuTemplate>
diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/hpc/precipitation.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/hpc/precipitation.xml
index 55feaf55e9..b750b7ad23 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/hpc/precipitation.xml
+++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/hpc/precipitation.xml
@@ -27,8 +27,10 @@
               menuText="Day 1 Excessive Rainfall" id="day1ExcessiveRainfall">
         <substitute key="wmo" value="PEI745"/>
     </contribute>
-	    <contribute xsi:type="bundleItem" file="bundles/ncepHydro/hpc/HPCqpfNDFD-PPFFG.xml"
+	    <contribute xsi:type="bundleItem" file="bundles/ncepHydro/hpc/HPCqpfNDFD.xml"
 			menuText="1-3 Day Excessive Rainfall (Grid)" id="day1to3ExcessiveRainfall">
+                        <substitute key="frameCount" value="3" />
+                        <substitute key="param" value="PPFFG" />
        </contribute>				
     <contribute xsi:type="bundleItem" file="bundles/Redbook_customLegend.xml" 
 			menuText="Precip Accum - 6 hr" id="precipAccum6hr">
@@ -137,4 +139,4 @@
     <contribute xsi:type="bundleItem" file="bundles/ncepHydro/hpc/HPCqpfNDFD120hr.xml" 
 			menuText="1-5 Day HPC QPF Total (Grid)" id="oneTo5HPCQPF">
    	</contribute>   
-</menuTemplate>
\ No newline at end of file
+</menuTemplate>
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TP168hr.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TP168hr.xml
new file mode 100755
index 0000000000..b57eb7152d
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TP168hr.xml
@@ -0,0 +1,32 @@
+<?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.
+    -->
+<DerivedParameter abbreviation="TP168hr" name="7 Day Total Gridded Precip" unit="mm">
+    <Method dtime="true" levels="Surface" name="Add">
+        <Field timeShift="0" abbreviation="TP24hr"/>
+        <Field timeShift="-86400" abbreviation="TP24hr"/>
+        <Field timeShift="-172800" abbreviation="TP24hr"/>
+        <Field timeShift="-259200" abbreviation="TP24hr"/>
+        <Field timeShift="-345600" abbreviation="TP24hr"/>
+        <Field timeShift="-432000" abbreviation="TP24hr"/>
+        <Field timeShift="-518400" abbreviation="TP24hr"/>
+        <Field timeShift="-604800" abbreviation="TP24hr"/>
+    </Method>
+</DerivedParameter>    
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TP72hr.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TP72hr.xml
new file mode 100644
index 0000000000..c1f3715c22
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TP72hr.xml
@@ -0,0 +1,38 @@
+<?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.
+    -->
+<DerivedParameter abbreviation="TP72hr" name="3 Day Total Gridded Precip" unit="mm">
+    <Method dtime="true" levels="Surface" name="Add">
+        <Field timeShift="0" abbreviation="TP6hr"/>
+        <Field timeShift="-21600" abbreviation="TP6hr"/>
+        <Field timeShift="-43200" abbreviation="TP6hr"/>
+        <Field timeShift="-64800" abbreviation="TP6hr"/>
+        <Field timeShift="-86400" abbreviation="TP6hr"/>
+        <Field timeShift="-108000" abbreviation="TP6hr"/>
+        <Field timeShift="-129600" abbreviation="TP6hr"/>
+        <Field timeShift="-151200" abbreviation="TP6hr"/>
+        <Field timeShift="-172800" abbreviation="TP6hr"/>
+        <Field timeShift="-194400" abbreviation="TP6hr"/>
+        <Field timeShift="-216000" abbreviation="TP6hr"/>
+        <Field timeShift="-237600" abbreviation="TP6hr"/>
+        <Field timeShift="-259200" abbreviation="TP6hr"/>
+
+    </Method>
+</DerivedParameter>    
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
index 18e6e44ba5..23ec447eb1 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
@@ -1095,7 +1095,9 @@ in|.0394|.0| 4 | |f5.2|@.|8000F0FF| |13|\
      <parameter>TP12hr</parameter>
      <parameter>TP48hr</parameter>     
      <parameter>TPrun</parameter>
-     <parameter>TP120hr</parameter>  
+     <parameter>TP120hr</parameter>
+     <parameter>TP72hr</parameter>
+     <parameter>TP168hr</parameter>
      <parameter>tpHPC</parameter>                            
      <parameter>tpHPCndfd</parameter>                       
   </paramLevelMatches>
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
index 365cfa3b04..97219f5046 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
@@ -1271,9 +1271,11 @@
 			<parameter>TP48hr</parameter>
 			<parameter>TPrun</parameter>
 			<parameter>TP120hr</parameter>
-            <parameter>TP6hr_std</parameter>
-            <parameter>TP6hr_avg</parameter>
-            <parameter>TP24hr_avg</parameter> 
+                        <parameter>TP72hr</parameter>
+                        <parameter>TP168hr</parameter>
+                        <parameter>TP6hr_std</parameter>
+                        <parameter>TP6hr_avg</parameter>
+                        <parameter>TP24hr_avg</parameter> 
 		</paramLevelMatches>
 		<imageStyle>
 			<!-- filterLow="true" -->