VLab Issue #3617 - DCS_266 Ingest & Display HRRR Model Data

Change-Id: Ic43d3a3f51d70cd41ef8e34ccde9d1f5aee3007b

Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/LevelMappingFile.xml

Former-commit-id: cc354742e1 [formerly a053fd5bad] [formerly 95451b2959 [formerly d95450f2eebc6b3d10093bd16736b349a1d0b12b]]
Former-commit-id: 95451b2959
Former-commit-id: 236a089297

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/CCP.xml

@@ -22,6 +22,18 @@
     <Method name="Alias">
         <Field abbreviation="CCOV"/>
     </Method>
+    <Method name="Alias" models="HRRR">
+        <Field abbreviation="TCC"/>
+    </Method>
+    <Method name="Alias" levels="HiLyr">
+        <Field abbreviation="HCDC" level="HiLyr"/>
+    </Method>    
+    <Method name="Alias" levels="MidLyr">
+        <Field abbreviation="MCDC" level="MidLyr"/>
+    </Method>
+    <Method name="Alias"levels="LowLyr">
+        <Field abbreviation="LCDC" level="LowLyr"/>
+    </Method>
     <Method models="HPCGuide" displayName="Total Cloud Cover" name="Multiply">
         <Field abbreviation="TCC"/>
         <ConstantField value="100.0"/>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/GVV.xml

@@ -24,4 +24,7 @@
     	<Field abbreviation="P"/>
     	<ConstantField value="-2"/>
     </Method>
+    <Method name="Alias">
+    	<Field abbreviation="GVV1hr"/>
+    </Method>
 </DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/T.xml

@@ -49,6 +49,9 @@
         <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>

cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml

@@ -464,6 +464,16 @@
 				key="VGP"  indentText="true" />
 			<contribute xsi:type="menuItem" menuText="Conv Precip"
 				key="CP"  indentText="true" />
+			<contribute xsi:type="menuItem" menuText="Max Updraft VV"
+				key="MXUVV"  indentText="true" />
+			<contribute xsi:type="menuItem" menuText="Max Downdraft VV"
+				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"
+				key="PLPL"  indentText="true" />
+			<contribute xsi:type="menuItem" menuText="Max Lightning Threat"
+				key="LTNG"  indentText="true" />
 		</contribute>
 
 		<contribute xsi:type="toolbarSubMenu" menuText="Marine">
@@ -1334,6 +1344,14 @@
 			key="REFD"  indentText="true" />
 		<contribute xsi:type="menuItem" menuText="Derived Composite"
 			key="REFC"  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>
 
 	<!-- 

cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml

@@ -114,6 +114,7 @@
      -->
     <contribute xsi:type="toolBarItem" toolItemName = "Hgt">
     	<contribute xsi:type="menuItem" textLookup="LevelMapping" key="54ft"  indentText="false"/>
+    	<contribute xsi:type="menuItem" textLookup="LevelMapping" key="80m"  indentText="false"/>
     	<contribute xsi:type="menuItem" menuText="1500 m" key="1.5km"  indentText="false"/>
     	<contribute xsi:type="menuItem" textLookup="LevelMapping" key="0.5kmAgl"  indentText="false"/>
     	<contribute xsi:type="menuItem" textLookup="LevelMapping" key="1kmAgl"  indentText="false"/>
@@ -343,6 +344,7 @@
     	<contribute xsi:type="menuItem" textLookup="LevelMapping" key="LowLyr"  indentText="false"/>
     	<contribute xsi:type="menuItem" textLookup="LevelMapping" key="MidLyr"  indentText="false"/>
     	<contribute xsi:type="menuItem" textLookup="LevelMapping" key="HiLyr"  indentText="false"/>
+    	<contribute xsi:type="menuItem" textLookup="LevelMapping" key="SIG0.8-0.5"  indentText="false"/>
     	<contribute xsi:type="titleImgItem" titleText="Pressure" displayImage="true" displayDashes="true"/>
     	<contribute xsi:type="menuItem" textLookup="LevelMapping" key="300MB-200MB"  indentText="false"/>
     	<contribute xsi:type="menuItem" textLookup="LevelMapping" key="400MB-200MB"  indentText="false"/>
@@ -355,6 +357,7 @@
     	<contribute xsi:type="menuItem" textLookup="LevelMapping" key="850MB-700MB"  indentText="false"/>
     	<contribute xsi:type="menuItem" textLookup="LevelMapping" key="925MB-700MB"  indentText="false"/>
     	<contribute xsi:type="menuItem" textLookup="LevelMapping" key="925MB-850MB"  indentText="false"/>
+    	<contribute xsi:type="menuItem" textLookup="LevelMapping" key="1000MB-400MB"  indentText="false"/>
     	<contribute xsi:type="menuItem" textLookup="LevelMapping" key="1000MB-500MB"  indentText="false"/>
     	<contribute xsi:type="menuItem" textLookup="LevelMapping" key="1000MB-700MB"  indentText="false"/>
     	<contribute xsi:type="menuItem" textLookup="LevelMapping" key="1000MB-850MB"  indentText="false"/>
@@ -366,6 +369,7 @@
     	<contribute xsi:type="menuItem" textLookup="LevelMapping" key="0-5kmAgl"  indentText="false"/>
     	<contribute xsi:type="menuItem" textLookup="LevelMapping" key="0-6kmAgl"  indentText="false"/>
     	<contribute xsi:type="menuItem" textLookup="LevelMapping" key="0-10kmAgl"  indentText="false"/>
+    	<contribute xsi:type="menuItem" textLookup="LevelMapping" key="2-5kmAgl"  indentText="false"/>
     	<contribute xsi:type="menuItem" textLookup="LevelMapping" key="3-6kmAgl"  indentText="false"/>
     	
     	<contribute xsi:type="toolbarSubMenu" menuText="thin layers">

cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/LevelMappingFile.xml

@@ -1146,6 +1146,7 @@
 	</Level>
 	<Level displayName="Hi Layer" key="HiLyr" group="S">
 		<DatabaseLevel levelName="HCY" levelOneValue="0" />
+		<DatabaseLevel levelName="HCL" levelOneValue="0" />
 	</Level>
 	<Level displayName="Low Cloud Base" key="LowCloudBase" group="S">
 		<DatabaseLevel levelName="LCBL" levelOneValue="0" />
@@ -1345,4 +1346,20 @@
 	<Level displayName="Surface" key="1HYB">
 		<DatabaseLevel levelName="HYB" levelOneValue="1" />
 	</Level>
+	</Level>
+	<Level displayName="80 m" key="80m" group="S">
+		<DatabaseLevel levelName="FHAG" levelOneValue="80.0"
+			unit="m" />
+	</Level>
+	<Level displayName="SIG0.8-0.5" key="SIG0.8-0.5" group="S">
+		<DatabaseLevel levelName="SIG" levelOneValue="0.5"
+			levelTwoValue="0.8" unit="m/s" />
+	</Level>
+	<Level displayName="1000MB-400MB" key="1000MB-400MB" group="C">
+		<DatabaseLevel levelName="MB" levelOneValue="1000"
+			levelTwoValue="400" unit="hPa" />
+	</Level>
+	<Level displayName="2-5km AGL" key="2-5kmAgl" group="C">
+		<DatabaseLevel levelName="FHAG" levelOneValue="2000"
+			levelTwoValue="5000.0" unit="m" />
 </LevelMappings>

cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml

@@ -33,6 +33,7 @@
 	<vbSource key="HiResW-NMM-PR" category="Volume" />
 	<vbSource key="HiResW-NMM-SJU" category="Volume" />
 	<vbSource key="HiResW-NMM-West" category="Volume" />
+	<vbSource key="HRRR" category="Volume" />
 	<vbSource key="MRF204" category="Volume" />
 	<vbSource key="LAMPQPF" category="Volume" />
 	<vbSource key="LAPS" category="Volume" />

edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml

@@ -4,6 +4,7 @@
     <alias base="MPE-Local">localMPE</alias>
     <alias base="MPE-Mosaic">mosaicMPE</alias>
     <alias base="HPE">localHPE</alias>
+    <alias base="HRRR">HRRR</alias>
     <alias base="BHPE">localBHPE</alias>
     <alias base="RFCqpf">qpf218</alias>
     <alias base="nogaps">nogaps</alias>

edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/parameter/alias/gfeParamName.xml

@@ -276,6 +276,7 @@
     <alias base="ThP6hr">thp6hr</alias>
     <alias base="Tmean">tmean</alias>
     <alias base="TOTSN">totsn</alias>
+    <alias base="TP1hr">tp1hr</alias>
     <alias base="TP120hr">tp120hr</alias>
     <alias base="tp12c1">tp12c1</alias>
     <alias base="tp12c2">tp12c2</alias>

edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

@@ -985,6 +985,7 @@ GlobalWave  = ('GlobalWave',   GRID,   '', NO,  NO,  2, 0)
 GLWM        = ('GLWM',         GRID,   '', NO,  NO,  2, 0)##########DCS3499
 HIRESWarw   = ('HIRESWarw',    GRID,   '', NO,  NO,  2, 0)##########DCS3501
 HIRESWnmm   = ('HIRESWnmm',    GRID,   '', NO,  NO,  2, 0)
+HRRR        = ("HRRR",         GRID,   '', NO,  NO,  3, 0)
 #### SPC         = ('SPC',          GRID,   '', NO,  NO,  2, 0)###DR20634
 WCwave10    = ('WCwave10',     GRID,   '', NO,  NO,  2, 0)
 WCwave4     = ('WCwave4',      GRID,   '', NO,  NO,  2, 0)
@@ -1115,6 +1116,7 @@ elif SID in CONUS_EAST_SITES:
     D2DMODELS = [('GFS212', 'GFS40'),
                  ('AVN211', 'GFS80'),
                  ('ETA', 'NAM80'),
+                 ('HRRR', 'HRRR'),
                  ('NGM', 'NGM80'),
                  ('MRF', 'gfsLR'),
                  ('RUC130', 'RUC13'),
@@ -1431,6 +1433,7 @@ else:
         "RTMA": ['RTMA'],
         "NamDNG5" : ["NamDNG5"],
         "SREF" : ["SREF"],
+        "HRRR" : ['HRRR'],
 #########DCS3501
         "GLWM" : ["GLWM"],
         "HIRESWarw" : ["HIRESWarw"],
@@ -1466,6 +1469,7 @@ D2DAccumulativeElements= {
     "GFS80": ["tp", "cp"],
     "GFS75": ["tp", "cp"],
     "GFS190": ["tp", "cp"],
+    "HRRR": ["tp1hr", "crain", "csnow", "cfrzr", "cicep"],
     "NAM95": ["tp", "cp"],
     "NAM80": ["tp", "cp"],
     "NAM40": ["tp", "cp"],
@@ -1620,6 +1624,7 @@ if not BASELINE and siteImport('localConfig'):
     localGLWMParms = getattr(localConfig, 'parmsGLWM', localGLWMParms)        #########DCS3499
     localHIRESWarwParms = getattr(localConfig, 'parmsHIRESWarw', localHIRESWarwParms)   ########DCS3501
     localHIRESWnmmParms = getattr(localConfig, 'parmsHIRESWnmm', localHIRESWnmmParms)
+    localHRRRParms = getattr(localConfig, 'parmsHRRR', localHRRRParms)
 #DR20634    localSPCParms = getattr(localConfig, 'parmsSPC', localSPCParms)
     localWNAWAVEParms = getattr(localConfig, 'parmsWNAWAVE', localWNAWAVEParms)
     localAKWAVEParms = getattr(localConfig, 'parmsAKWAVE', localAKWAVEParms)
@@ -1681,6 +1686,8 @@ STD1_MODEL = [([Temp, Td, RH, Wind, Wind20ft, Sky, FzLevel, SnowLevel], TC1),
              ([MaxT], MaxTTC), ([MinT], MinTTC),
              ([Wetflag], FireWx1300TC)]
 
+HRRRPARMS = [([Temp, Td, RH, Wind, WindGust, Sky, QPF], TC1)]
+
 # 3 hourly
 STD3_MODEL = [([Temp, Td, RH, Wind, Wind20ft, Sky, FzLevel, SnowLevel], TC3),
              ([Haines, MixHgt, FreeWind, TransWind], TC3),
@@ -1691,6 +1698,7 @@ STD3_MODEL = [([Temp, Td, RH, Wind, Wind20ft, Sky, FzLevel, SnowLevel], TC3),
              ([MaxT], MaxTTC), ([MinT], MinTTC),
              ([Wetflag], FireWx1300TC)]
 
+
 ######DCS3501
 # 3 hourly-HIRESW
 STD3_MODEL_HIRESW = [([Temp, Td, RH, Wind, FzLevel], TC3),
@@ -1861,6 +1869,7 @@ DATABASES = [(Official, OFFICIALDBS + localParms),
              (GLWM, GLWMPARMS + localGLWMParms),            #####DCS3499
              (HIRESWarw, STD3_MODEL + localHIRESWarwParms), #####DCS3501
              (HIRESWnmm, STD3_MODEL + localHIRESWnmmParms),
+             (HRRR, HRRRPARMS + localHRRRparms),
 #DR20634             (SPC, SPCPARMS + localSPCParms),
              (WCwave10, WAVEPARMS + localWCwave10Parms),
              (WCwave4, WAVEPARMS + localWCwave4Parms),

edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/HRRR.xml

@@ -0,0 +1,525 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<gridParamInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <valtimeMINUSreftime>
+    <fcst>0</fcst>
+    <fcst>3600</fcst>
+    <fcst>7200</fcst>
+    <fcst>10800</fcst>
+    <fcst>14400</fcst>
+    <fcst>18000</fcst>
+    <fcst>21600</fcst>
+    <fcst>25200</fcst>
+    <fcst>28800</fcst>
+    <fcst>32400</fcst>
+    <fcst>36000</fcst>
+    <fcst>39600</fcst>
+    <fcst>43200</fcst>
+    <fcst>46800</fcst>
+    <fcst>50400</fcst>
+    <fcst>54000</fcst>
+  </valtimeMINUSreftime>
+  <gridParameterInfo xsi:type="parameterInfo">
+    <short_name>refc</short_name>
+    <long_name>composite radar reflectivity</long_name>
+    <units>dBZ</units>
+    <udunits>decibals</udunits>
+    <uiname>Refc</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100000.0</valid_range>
+    <fillValue>-99999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>EA</levelsDesc>
+    <levels>
+      <level>EA</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xsi:type="parameterInfo">
+    <short_name>refd</short_name>
+    <long_name>derived radar reflectivity</long_name>
+    <units>dBZ</units>
+    <udunits>decibals</udunits>
+    <uiname>Refd</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100000.0</valid_range>
+    <fillValue>-99999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>FHAG 1000 HYB 1</levelsDesc>
+    <levels>
+      <level>FHAG1000</level>
+      <level>HYB1</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xsi:type="parameterInfo">
+    <short_name>sli</short_name>
+    <long_name>Surface lifted index</long_name>
+    <units>K</units>
+    <udunits>degree_Kelvin</udunits>
+    <uiname>LftInd</uiname>
+    <valid_range>-20.0</valid_range>
+    <valid_range>20.0</valid_range>
+    <fillValue>-99999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>MB 0&gt;500</levelsDesc>
+    <levels>
+      <level>MB0500</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xsi:type="parameterInfo">
+    <short_name>cape</short_name>
+    <long_name>Convective Available Potential Energy</long_name>
+    <units>J/kg</units>
+    <udunits>joule/Kilogram</udunits>
+    <uiname>CAPE</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>6000.0</valid_range>
+    <fillValue>-99999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC BL 0&gt;180 0&gt;255</levelsDesc>
+    <levels>
+      <level>SFC</level>
+      <level>BL0180</level>
+      <level>BL0255</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xsi:type="parameterInfo">
+    <short_name>staticSpacing</short_name>
+    <long_name>Grid spacing</long_name>
+    <units>m</units>
+    <fillValue>-99999.0</fillValue>
+    <n3D>0</n3D>
+  </gridParameterInfo>
+  <gridParameterInfo xsi:type="parameterInfo">
+    <short_name>tp</short_name>
+    <long_name>total precipitation</long_name>
+    <units>mm</units>
+    <udunits>millimeter</udunits>
+    <uiname>totPrecip</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>1000.0</valid_range>
+    <fillValue>-99999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xsi:type="parameterInfo">
+    <short_name>weasd</short_name>
+    <long_name>water equivalent of accumulated snow depth</long_name>
+    <units>ml</units>
+    <udunits>mil</udunits>
+    <uiname>waterEqvAccSnowDepth</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>1000.0</valid_range>
+    <fillValue>-99999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xsi:type="parameterInfo">
+    <short_name>cpozp</short_name>
+    <long_name>Probability of freezing precip</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>FreezePcpProb</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-99999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xsi:type="parameterInfo">
+    <short_name>tcc</short_name>
+    <long_name>Total Cloud Cover</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>totalCldCvr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-99999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>EA</levelsDesc>
+    <levels>
+      <level>EA</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xsi:type="parameterInfo">
+    <short_name>lcdc</short_name>
+    <long_name>Low-level cloud fraction</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>lowLvlCldFr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-99999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>LCY</levelsDesc>
+    <levels>
+      <level>LCY</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xsi:type="parameterInfo">
+    <short_name>mcdc</short_name>
+    <long_name>Mid-level cloud fraction</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>midLvlCldFr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-99999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>MCY</levelsDesc>
+    <levels>
+      <level>MCY</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xsi:type="parameterInfo">
+    <short_name>hcdc</short_name>
+    <long_name>High-level cloud fraction</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>highLvlCldFr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-99999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>HCL</levelsDesc>
+    <levels>
+      <level>HCL</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xsi:type="parameterInfo">
+    <short_name>crain</short_name>
+    <long_name>Categorical rain</long_name>
+    <units>yes=1, no=0</units>
+    <udunits />
+    <uiname>CategoricalRain</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>1.0</valid_range>
+    <fillValue>-99999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xsi:type="parameterInfo">
+    <short_name>uw</short_name>
+    <long_name>u wind component</long_name>
+    <units>m/s</units>
+    <udunits>meter/sec</udunits>
+    <uiname>uWind</uiname>
+    <valid_range>-150.0</valid_range>
+    <valid_range>150.0</valid_range>
+    <fillValue>-99999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>10 FHAG</levelsDesc>
+    <levels>
+      <level>FHAG10</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xsi:type="parameterInfo">
+    <short_name>cin</short_name>
+    <long_name>Convective Inhibition</long_name>
+    <units>J/kg</units>
+    <udunits>joule/Kilogram</udunits>
+    <uiname>convInhib</uiname>
+    <valid_range>-1000.0</valid_range>
+    <valid_range>1000.0</valid_range>
+    <fillValue>-99999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC BL 0&gt;255</levelsDesc>
+    <levels>
+      <level>SFC</level>
+      <level>BL0255</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xsi:type="parameterInfo">
+    <short_name>mmsp</short_name>
+    <long_name>pressure at mean sea level</long_name>
+    <units>Pa</units>
+    <udunits>pascal</udunits>
+    <uiname>PMSL</uiname>
+    <valid_range>80000.0</valid_range>
+    <valid_range>110000.0</valid_range>
+    <fillValue>-99999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>MSL</levelsDesc>
+    <levels>
+      <level>MSL</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xsi:type="parameterInfo">
+    <short_name>snd</short_name>
+    <long_name>Snow depth</long_name>
+    <units>m</units>
+    <udunits>meters</udunits>
+    <uiname>snowDepth</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>10.0</valid_range>
+    <fillValue>-99999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xsi:type="parameterInfo">
+    <short_name>csnow</short_name>
+    <long_name>Categorical snow</long_name>
+    <units>yes=1, no=0</units>
+    <udunits />
+    <uiname>CategoricalSnow</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>1.0</valid_range>
+    <fillValue>-99999.0</fillValue>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xsi:type="parameterInfo">
+    <short_name>cicep</short_name>
+    <long_name>Categorical ice pellets</long_name>
+    <units>yes=1, no=0</units>
+    <udunits />
+    <uiname>CategoricalIcePlt</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>1.0</valid_range>
+    <fillValue>-99999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xsi:type="parameterInfo">
+    <short_name>bli</short_name>
+    <long_name>Best lifted index</long_name>
+    <units>K</units>
+    <udunits>degree_Kelvin</udunits>
+    <uiname>bestLftInd</uiname>
+    <valid_range>-20.0</valid_range>
+    <valid_range>50.0</valid_range>
+    <fillValue>-99999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>BL 0&gt;180</levelsDesc>
+    <levels>
+      <level>BL0180</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xsi:type="parameterInfo">
+    <short_name>staticTopo</short_name>
+    <long_name>Topography</long_name>
+    <units>m</units>
+    <fillValue>-99999.0</fillValue>
+  </gridParameterInfo>
+  <gridParameterInfo xsi:type="parameterInfo">
+    <short_name>wgs</short_name>
+    <long_name>Wind Gust Speed</long_name>
+    <units>m/s</units>
+    <udunits>meter/sec</udunits>
+    <uiname>windGustSpeed</uiname>
+    <valid_range>0</valid_range>
+    <valid_range>150.0</valid_range>
+    <fillValue>-99999.0</fillValue>
+    <n3D>1</n3D>
+    <levelsDesc>10 FHAG</levelsDesc>
+    <levels>
+      <level>FHAG10</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xsi:type="parameterInfo">
+    <short_name>wgs1hr</short_name>
+    <long_name>Max 1hr Wind Speed</long_name>
+    <units>m/s</units>
+    <udunits>meter/sec</udunits>
+    <uiname>maxWindSpeed</uiname>
+    <valid_range>0</valid_range>
+    <valid_range>150.0</valid_range>
+    <fillValue>-99999.0</fillValue>
+    <n3D>1</n3D>
+    <levelsDesc>10 FHAG</levelsDesc>
+    <levels>
+      <level>FHAG10</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xsi:type="parameterInfo">
+    <short_name>dpt</short_name>
+    <long_name>Dewpoint Temperature</long_name>
+    <units>K</units>
+    <udunits>degree_Kelvin</udunits>
+    <uiname>Td</uiname>
+    <valid_range>180.0</valid_range>
+    <valid_range>330.0</valid_range>
+    <fillValue>-99999.0</fillValue>
+    <n3D>1</n3D>
+    <levelsDesc>FHAG 2</levelsDesc>
+    <levels>
+      <level>FHAG2</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xsi:type="parameterInfo">
+    <short_name>heli</short_name>
+    <long_name>helicity sigma</long_name>
+    <units>m/s2</units>
+    <udunits>meter/second2</udunits>
+    <uiname>hel</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>1000.0</valid_range>
+    <fillValue>-99999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>FHAG 1000 3000</levelsDesc>
+    <levels>
+      <level>FHAG1000</level>
+      <level>FHAG3000</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xsi:type="parameterInfo">
+    <short_name>vis</short_name>
+    <long_name>visibility</long_name>
+    <units>m</units>
+    <udunits>meters</udunits>
+    <uiname>Vis</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100000.0</valid_range>
+    <fillValue>-99999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xsi:type="parameterInfo">
+    <short_name>vw</short_name>
+    <long_name>v wind component</long_name>
+    <units>m/s</units>
+    <udunits>meter/sec</udunits>
+    <uiname>vWind</uiname>
+    <valid_range>-150.0</valid_range>
+    <valid_range>150.0</valid_range>
+    <fillValue>-99999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>10 FHAG</levelsDesc>
+    <levels>
+      <level>FHAG10</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xsi:type="parameterInfo">
+    <short_name>t</short_name>
+    <long_name>Temperature</long_name>
+    <units>K</units>
+    <udunits>degree_Kelvin</udunits>
+    <uiname>T</uiname>
+    <valid_range>180.0</valid_range>
+    <valid_range>330.0</valid_range>
+    <fillValue>-99999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>2 FHAG</levelsDesc>
+    <levels>
+      <level>FHAG2</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xsi:type="parameterInfo">
+    <short_name>staticCoriolis</short_name>
+    <long_name>Coriolis parameter</long_name>
+    <units>s^-1</units>
+    <fillValue>-99999.0</fillValue>
+  </gridParameterInfo>
+  <gridParameterInfo xsi:type="parameterInfo">
+    <short_name>gh</short_name>
+    <long_name>Geopotential height</long_name>
+    <units>m</units>
+    <udunits>meters</udunits>
+    <uiname>geoPotHt</uiname>
+    <valid_range>-2000.0</valid_range>
+    <valid_range>20000.0</valid_range>
+    <fillValue>-99999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>CBL CTL</levelsDesc>
+    <levels>
+      <level>CBL</level>
+      <level>CTL</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xsi:type="parameterInfo">
+    <short_name>p</short_name>
+    <long_name>pressure</long_name>
+    <units>Pa</units>
+    <udunits>pascal</udunits>
+    <uiname>atmP</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>110000.0</valid_range>
+    <fillValue>-99999.0</fillValue>
+    <n3D>1</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xsi:type="parameterInfo">
+    <short_name>pw</short_name>
+    <long_name>precipitable water</long_name>
+    <units>mm</units>
+    <udunits>millimeter</udunits>
+    <uiname>precipH2O</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>300.0</valid_range>
+    <fillValue>-99999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>EA</levelsDesc>
+    <levels>
+      <level>EA</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xsi:type="parameterInfo">
+    <short_name>cfrzr</short_name>
+    <long_name>Categorical freezing rain</long_name>
+    <units>yes=1, no=0</units>
+    <udunits />
+    <uiname>CategoricalFrzRain</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>1.0</valid_range>
+    <fillValue>-99999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xsi:type="parameterInfo">
+    <short_name>wd</short_name>
+    <long_name>Wind Direction</long_name>
+    <units>degreeTrue</units>
+    <udunits>degree_True</udunits>
+    <uiname>windDir</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>360.0</valid_range>
+    <fillValue>-99999.0</fillValue>
+    <n3D>1</n3D>
+    <levelsDesc>FHAG 10</levelsDesc>
+    <levels>
+      <level>FHAG10</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xsi:type="parameterInfo">
+    <short_name>mwind</short_name>
+    <long_name>Maximum Wind Speed</long_name>
+    <units>m/s</units>
+    <udunits>meter/sec</udunits>
+    <uiname>maxWindSpeed</uiname>
+    <valid_range>0</valid_range>
+    <valid_range>150</valid_range>
+    <fillValue>-99999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>10 FHAG</levelsDesc>
+    <levels>
+      <level>FHAG10</level>
+    </levels>
+  </gridParameterInfo>
+</gridParamInfo>

edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/HRRR.py

@@ -0,0 +1,184 @@
+#
+from Init import *
+##--------------------------------------------------------------------------
+class HRRRForecaster(Forecaster):
+    def __init__(self):
+        Forecaster.__init__(self, "HRRR","HRRR")
+
+#    def calcClgHgt(self, cc_CCL):
+#        ceil = cc_CCL * .03280839
+#        ceil = where(less_equal(ceil, 0.0), 250.0, ceil)
+#        return ceil
+
+    def calcVis(self, vis_SFC):
+        return (vis_SFC * 3.2808) / 5279.85564
+
+    def calcT(self, t_FHAG2):
+        return self.KtoF(t_FHAG2)
+
+    def calcTd(self, dpt_FHAG2):
+        return self.KtoF(dpt_FHAG2)
+
+##--------------------------------------------------------------------------
+## Returns the maximum of the specified MaxT and the T grids
+##--------------------------------------------------------------------------
+##    def calcMaxT(self, T, MaxT):
+##        if MaxT is None:
+##            return T
+##        return maximum(MaxT, T)
+
+##--------------------------------------------------------------------------
+## Returns the minimum of the specified MinT and T grids
+##--------------------------------------------------------------------------
+##    def calcMinT(self, T, MinT):
+##        if MinT is None:
+##            return T
+##        return minimum(MinT, T)
+
+
+    def calcRH(self, T, Td):
+        Tc = .556 * (T - 32.0)
+        Tdc = .556 * (Td - 32.0)
+        Vt = 6.11 * pow(10, (Tc * 7.5 / (Tc + 237.3)))
+        Vd = 6.11 * pow(10, (Tdc * 7.5 / (Tdc + 237.3)))
+        RH = (Vd / Vt) * 100.0
+        # return the new value
+        return RH
+
+    def dewFromTandRH(self,T,RH):
+        tc=(T-32.0)*(5.0/9.0)
+        rh=clip(RH,0.001,99.999)/100.0
+        x=(log(rh)/17.67)+(tc/(tc+243.5))
+        tdc=(243.5*x)/(1.0-x)
+        td=(tdc*9.0/5.0)+32.0
+        return td
+
+##--------------------------------------------------------------------------
+# Calculates QPF from the total precip field out of the model
+##--------------------------------------------------------------------------
+    def calcQPF(self, tp_SFC):
+        return tp_SFC / 25.4   # convert from millimeters to inches
+
+    def calcQPF6(self, QPF, QPF6):
+        if QPF6 is None:
+           QPF6=QPF
+        else:
+           QPF6=QPF6+QPF
+        return QPF6
+
+    def calcQPF12(self, QPF6, QPF12):
+        if QPF12 is None:
+           QPF12=QPF6
+        else:
+           QPF12=QPF12+QPF6
+        return QPF12
+
+##--------------------------------------------------------------------------
+##  Converts the lowest available wind level from m/s to knots
+##--------------------------------------------------------------------------
+    def calcWind(self, wind_FHAG10):
+	return (wind_FHAG10[0] * 1.94,clip(wind_FHAG10[1], 0, 359.5))
+#
+#  Return the max of the max wind or wind gust
+# 
+    def calcWindGust(self, wgs_FHAG10, wgs1hr_FHAG10):
+        return (maximum(wgs_FHAG10,wgs1hr_FHAG10) * 1.94)
+#=========================================================================
+#  SnowAmt - simple snow ratio based on surface temperature - multiplied
+#            times the model QPF amount
+#-------------------------------------------------------------------------
+
+    def calcSnowAmt(self,T,QPF):
+        m1=less(T,9.0)
+        m2=greater_equal(T,30.0)
+        snowr=(T*-0.5)+22.5
+        snowr=where(m1,20,snowr)
+        snowr=where(m2,0,snowr)
+        snowamt=QPF*snowr
+        return snowamt
+
+##--------------------------------------------------------------------------
+##  Use cloud base and cloud top to get sky cover 
+##--------------------------------------------------------------------------
+
+#    def calcSky(self, gh_CBL, gh_CTL):
+#        depth=gh_CTL-gh_CBL
+#        c100=greater_equal(depth, 1000)
+#        partialcloudy=depth/10
+#        sky=0
+#        sky=where(depth, c100, sky)
+##        sky=where(depth, partialcloudy, sky)
+#        return sky	
+
+
+    def calcSky(self,tcc_EA):
+        return tcc_EA
+
+#--------------------------------------------------------------------------
+# PoP - based strongly on QPF (since when model has one inch of precip the
+#   chance of getting 0.01 is pretty high).  However, there is a big
+#   difference between a place that model has 0.00 precip and is very
+#   close to precipitating - and those where model has 0.00 and is a
+#   thousand miles from the nearest cloud.  Thus, uses the average
+#
+#   Uses hyperbolic tangent of QPF, so that it rises quickly as model
+#   QPF increases - but tapers out to nearly 100% as QPF gets high.
+#
+#   Adjustable parameters:
+#     topQPF is QPF amount that would give 75% PoP if nothing else
+#       considered at half this amount, PoP is 45%, at double this
+#       amount PoP is 96%.  Default set at 0.40.
+#
+#--------------------------------------------------------------------------
+#    def calcPoP(self, QPF12): 
+#
+#        topQPF=0.40    # QPF value where raw PoP would be 75%
+#        factor=tanh(QPF12*(1.0/topQPF))
+#        factor2=tanh(QPF12*(2.0/topQPF))
+#        pop=(factor*100.0)+(factor2*100.0)
+#        pop=clip(pop,0,100)
+#        return pop
+
+##--------------------------------------------------------------------------
+##  Use sky, reflecivity, qpf, vis, categoricals to get weather
+##--------------------------------------------------------------------------
+
+    def calcWx(self, T, QPF, Vsby, crain_SFC, csnow_SFC, cicep_SFC, bli_BL0180, cfrzr_SFC, refc_EA):
+
+        # Now apply a different algorithm for each type
+        key = ['<NoCov>:<NoWx>:<NoInten>:<NoVis>:',
+               "Wide:S:-:<NoVis>:", "Wide:R:-:<NoVis>:",
+               "Wide:S:-:<NoVis>:^Wide:R:-:<NoVis>:",
+               'Wide:ZR:-:<NoVis>:', 'Wide:IP:-:<NoVis>:',
+               'Wide:ZR:-:<NoVis>:^Wide:IP:-:<NoVis>:',
+               "Sct:SW:-:<NoVis>:", "Sct:RW:-:<NoVis>:",
+               "Sct:SW:-:<NoVis>:^Sct:RW:-:<NoVis>:",
+               "Chc:ZR:-:<NoVis>:", 'Chc:IP:-:<NoVis>:',
+               'Chc:ZR:-:<NoVis>:^Chc:IP:-:<NoVis>:']
+
+        wx = self._empty
+        wx = where(logical_and(greater(QPF,0.02),greater(T,35)), 2, wx)
+        wx = where(equal(crain_SFC, 1), 2, wx)
+        wx = where(equal(cfrzr_SFC, 1), 4, wx)
+        wx = where(equal(cicep_SFC, 1), 5, wx)
+        wx = where(equal(csnow_SFC, 1), 1, wx) 
+
+        # Make showers (scattered/Chc)
+        convecMask = less(refc_EA, 35)
+        wx = where(logical_and(not_equal(wx, 0), convecMask), wx + 6, wx)
+
+        # Thunder
+        for i in xrange(len(key)):
+            tcov = string.split(key[i], ":")[0]
+            if tcov == "Chc" or tcov == "<NoCov>":
+                tcov = "Sct"
+            key.append(key[i] + "^" + tcov
+                       + ":T:<NoInten>:<NoVis>:")
+        wx = where(logical_and(greater_equal(bli_BL0180, -3), greater_equal(refc_EA, 35)), wx + 13, wx)
+
+        # No wx where no qpf
+        wx = where(less(QPF, 0.01), 0, wx)
+        return(wx, key)
+
+def main():
+    HRRRForecaster().run()

edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_NCEP-7.xml

@@ -901,4 +901,9 @@
         <datasetId>PROB3HR</datasetId>
         <dt>3</dt>
     </info>
+    <info>
+        <title>HRRR</title>
+        <datasetId>HRRR</datasetId>
+        <dt>1</dt>
+    </info>
 </datasetInfoSet>

edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml

@@ -41,6 +41,15 @@
 		</process>
 	</model>
 
+	<model>
+		<name>HRRR</name>
+ 		<center>7</center>
+		<subcenter>0</subcenter>
+		<process>
+			<id>83</id>
+		</process>
+	</model>
+
 	<model>
 		<name>ETA</name>
 		<center>7</center>

edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/subgrids/HRRR-Clip.xml

@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<subGridDef>
+  <modelNames>HRRR</modelNames>
+  <referenceGrid>184</referenceGrid>
+  <nx>500</nx>
+  <ny>500</ny>
+  <!--
+  <centerLatitude>36.5</centerLatitude>
+  <centerLongitude>-81</centerLongitude>
+  -->
+</subGridDef>

edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/LTNG.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 unit="" name="Max Lightning Threat (flashes/km^2)" abbreviation="LTNG">
+</DerivedParameter>

edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/MXDVV.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="MXDVV" name="Max Downdraft Vertical Velocity" unit="m/s" >
+    <Method name="Alias">
+      <Field abbreviation="MAXDVV1hr"/>
+    </Method>
+</DerivedParameter>
+

edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/MXREF.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="MXREF" name="Max 1hr CAPPI" unit="dB" >
+    <Method name="Alias" >
+      <Field abbreviation="MAXREF1hr"  />
+    </Method>
+</DerivedParameter>
+

edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/MXUPHL.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 Updraft Helicity" unit="m^2/s^2" >
+    <Method name="Alias" >
+      <Field abbreviation="MXUPHL1hr"  />
+    </Method>
+</DerivedParameter>
+

edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/MXUVV.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="MXUVV" name="Max Updraft Vertical Velocity" unit="m/s" >
+    <Method name="Alias">
+      <Field abbreviation="MAXUVV1hr"/>
+    </Method>
+</DerivedParameter>
+

edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/WGS1hr.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<DerivedParameter abbreviation="WGS1hr" name="Max 1-hr Wind Gust Speed" unit="m/s">
+    <Method name="Alias" levels="Surface">
+    	<Field abbreviation="WGS1hr" level="10FHAG"/>
+    </Method>
+        <Method name="Vector" levels="Surface" >
+        <Field abbreviation="MAXUW1hr" level="FHAG10" />
+        <Field abbreviation="MAXVW1hr" level="FHAG10" />
+    </Method>
+</DerivedParameter>

edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml

@@ -732,4 +732,9 @@
 		<versionsToKeep>5</versionsToKeep>
 		<modTimeToWait>00-00:15:00</modTimeToWait>
 	</rule>
+        <!-- Purge rule for the HRRR model -->
+        <rule>
+                <keyValue>HRRR</keyValue>
+                <versionsToKeep>4</versionsToKeep>
+        </rule>
 </purgeRuleSet>