From 909f4d86325209192b7fc255e3da143a1564050b Mon Sep 17 00:00:00 2001
From: Ana Rivera <ana.rivera@noaa.gov>
Date: Thu, 11 Sep 2014 21:17:43 +0000
Subject: [PATCH] VLab Issue #4671 - Remove duplicate entries from
 fieldsMenus.xml, updates SMS RM 16720 (HRRR); fixes #4671

Change-Id: I9708b606e5a7d2c2fc9355d765fbad9113a40493

Former-commit-id: 94e5089beb782011d107de4aeeb8b35694f2f5c3
---
 .../derivedParameters/definitions/GVV1hr.xml  | 22 ++++++++++++++++
 .../derivedParameters/definitions/LTNG.xml    |  5 +++-
 .../derivedParameters/definitions/MAXUPHL.xml | 26 +++++++++++++++++++
 .../definitions/{MAXDVV.xml => MXDVV.xml}     |  2 +-
 .../definitions/{MAXUVV.xml => MXUVV.xml}     |  2 +-
 .../derivedParameters/definitions/T.xml       |  3 ---
 .../localization/menus/xml/fieldsMenus.xml    | 14 +++-------
 .../ModelFcstGridContours/HRRR-basic.xml      |  6 +++++
 .../ncep/ResourceDefns/GRID/HRRR/HRRR.xml     | 20 ++++++++++++++
 .../ncep/ResourceDefns/ResourceFilters.xml    |  3 +++
 10 files changed, 87 insertions(+), 16 deletions(-)
 create mode 100644 cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/GVV1hr.xml
 create mode 100644 cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/MAXUPHL.xml
 rename cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/{MAXDVV.xml => MXDVV.xml} (91%)
 rename cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/{MAXUVV.xml => MXUVV.xml} (91%)
 create mode 100644 ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/HRRR-basic.xml
 create mode 100644 ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/HRRR/HRRR.xml

diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/GVV1hr.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/GVV1hr.xml
new file mode 100644
index 0000000000..1a1dc7897c
--- /dev/null
+++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/GVV1hr.xml
@@ -0,0 +1,22 @@
+<?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="GVV1hr" name="Mean 1hr Geometric Vertical Velocity" unit="m/s" />
+
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/LTNG.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/LTNG.xml
index ee4144d376..688297a9d2 100644
--- a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/LTNG.xml
+++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/LTNG.xml
@@ -18,5 +18,8 @@
         See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
         further_licensing_information.
     -->
-<DerivedParameter unit="" name="Max Lightning Threat (flashes/km^2)" abbreviation="LTNG">
+<DerivedParameter unit="" name="Max 1hr Lightning Threat (flashes/km^2)" abbreviation="LTNG">
+    <Method name="Alias">
+      <Field abbreviation="LTNG1hr"/>
+    </Method>
 </DerivedParameter>
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/MAXUPHL.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/MAXUPHL.xml
new file mode 100644
index 0000000000..207cf19b35
--- /dev/null
+++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/MAXUPHL.xml
@@ -0,0 +1,26 @@
+<?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="MAXUPHL" name="Max 1hr Updraft Helicity" unit="m^2/s^2" >
+    <Method name="Alias" >
+      <Field abbreviation="MXUPHL1hr"  />
+    </Method>
+</DerivedParameter>
+
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/MAXDVV.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/MXDVV.xml
similarity index 91%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/MAXDVV.xml
rename to cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/MXDVV.xml
index cdd0fb9419..be8fa65f36 100644
--- a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/MAXDVV.xml
+++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/MXDVV.xml
@@ -18,7 +18,7 @@
         See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
         further_licensing_information.
     -->
-<DerivedParameter abbreviation="MAXDVV" name="Max Downdraft Vertical Velocity" unit="m/s" >
+<DerivedParameter abbreviation="MXDVV" name="Max 1hr Downdraft Vertical Velocity" unit="m/s" >
     <Method name="Alias">
       <Field abbreviation="MAXDVV1hr"/>
     </Method>
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/MAXUVV.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/MXUVV.xml
similarity index 91%
rename from cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/MAXUVV.xml
rename to cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/MXUVV.xml
index 431f6e2fc2..a102178086 100644
--- a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/MAXUVV.xml
+++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/MXUVV.xml
@@ -18,7 +18,7 @@
         See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
         further_licensing_information.
     -->
-<DerivedParameter abbreviation="MAXUVV" name="Max Updraft Vertical Velocity" unit="m/s" >
+<DerivedParameter abbreviation="MXUVV" name="Max 1hr Updraft Vertical Velocity" unit="m/s" >
     <Method name="Alias">
       <Field abbreviation="MAXUVV1hr"/>
     </Method>
diff --git a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/T.xml b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/T.xml
index 7cb5ee8246..2ca7b78207 100644
--- a/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/T.xml
+++ b/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/T.xml
@@ -49,9 +49,6 @@
         <ConstantField value="-1e35"/>
         <ConstantField value="-1"/>
     </Method>
-    <Method models="HRRR" name="Alias" levels="Skin" >
-        <Field level="Surface" abbreviation="T"/>
-    </Method>
     <Method models="SREF212" name="Alias">
         <Field abbreviation="Tmean"/>
     </Method>
diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
index 93a4245313..ab4b1f72bb 100644
--- a/cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
+++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
@@ -104,6 +104,8 @@
 			 indentText="false" />
 		<contribute xsi:type="menuItem" menuText="Geometric Vert Velocity"
 			key="GVV"  indentText="true" />
+		<contribute xsi:type="menuItem" menuText="Mean 1hr Geometric Vert Velocity" 
+			key="GVV1hr"  indentText="true" />
 		<contribute xsi:type="menuItem" menuText="Vert Velocity"
 			key="VV"  indentText="true" />
 		<contribute xsi:type="menuItem" menuText="Wind Gust" key="Gust"
@@ -302,9 +304,9 @@
 			<contribute xsi:type="menuItem" menuText="MSLP Grad Vec"
 				key="PGrd1"  indentText="false" />
 			<contribute xsi:type="menuItem" menuText="Max Updraft VV"
-				key="MAXUVV"  indentText="true" />
+				key="MXUVV"  indentText="true" />
 			<contribute xsi:type="menuItem" menuText="Max Downdraft VV"
-				key="MAXDVV"  indentText="true" />
+				key="MXDVV"  indentText="true" />
 			<contribute xsi:type="menuItem" menuText="Max Updraft Helicity"
 				key="MAXUPHL"  indentText="true" />
 			<contribute xsi:type="menuItem" menuText="Most Unstable BL Parcel Level"
@@ -1370,14 +1372,6 @@
 			key="VILIQ"  indentText="true" />
 		<contribute xsi:type="menuItem" menuText="Derived Echo Top"
 			key="RETOP"  indentText="true" />
-		<contribute xsi:type="menuItem" menuText="CAPPI"
-			key="REFD"  indentText="true" />
-		<contribute xsi:type="menuItem" menuText="MAX 1hr CAPPI"
-			key="MXREF"  indentText="true" />
-		<contribute xsi:type="menuItem" menuText="Derived VIL"
-			key="VILIQ"  indentText="true" />
-		<contribute xsi:type="menuItem" menuText="Derived Echo Top"
-			key="RETOP"  indentText="true" />
 	</contribute>
 
 	<!-- 
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/HRRR-basic.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/HRRR-basic.xml
new file mode 100644
index 0000000000..a457dce328
--- /dev/null
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/ModelFcstGridContours/HRRR-basic.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<AttributeSetGroup xmlns:ns2="http://www.example.org/productType">
+    <resource>HRRR</resource>
+    <attrSetGroupName>standard</attrSetGroupName>
+    <attrSetNames>1000-500_thkn,1000-850_thkn,1000mb_hght_tmp_wind,500mb_hght_wind,500mb_hght_tmp_wind,700mb_hght_tmp_wind,850mb_hght_tmp_wind</attrSetNames>
+</AttributeSetGroup>
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/HRRR/HRRR.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/HRRR/HRRR.xml
new file mode 100644
index 0000000000..405c6c4f2d
--- /dev/null
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/HRRR/HRRR.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<ResourceDefinition xmlns:ns2="http://www.example.org/productType">
+    <resourceDefnName>HRRR</resourceDefnName>
+    <resourceCategory>GRID</resourceCategory>
+    <rscImplementation>ModelFcstGridContours</rscImplementation>
+    <subTypeGenerator></subTypeGenerator>
+    <rscTypeGenerator></rscTypeGenerator>
+    <timeMatchMethod>CLOSEST_BEFORE_OR_AFTER</timeMatchMethod>
+    <frameSpan>60</frameSpan>
+    <timelineGenMethod>USE_CYCLE_TIME_FCST_HOURS</timelineGenMethod>
+    <dfltFrameCount>16</dfltFrameCount>
+    <dfltTimeRange>16</dfltTimeRange>
+    <dfltGeogArea>BasicWX_US</dfltGeogArea>
+    <resourceParameters>
+pluginName=grid
+GDFILE=HRRR
+
+</resourceParameters>
+    <inventoryEnabled>true</inventoryEnabled>
+</ResourceDefinition>
diff --git a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/ResourceFilters.xml b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/ResourceFilters.xml
index 88e95b3b18..6c1b35df24 100644
--- a/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/ResourceFilters.xml
+++ b/ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/ResourceFilters.xml
@@ -1407,4 +1407,7 @@
 <ResourceDefinitionFilter isEnabled="true" rscDefnName="SOLARFLUX">
 <filters>Forecast,SWPC</filters>
 </ResourceDefinitionFilter>
+<ResourceDefinitionFilter isEnabled="true" rscDefnName="HRRR">
+<filters>Forecast,SBN</filters>
+</ResourceDefinitionFilter>
 </ResourceDefinitionFilters>
\ No newline at end of file