xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Omaha #4958: Add support for viewing raw NationalBlend model data to GFE." into omaha_16.1.1

Browse source 
Former-commit-id: 94e8f7d9d8f2e77132c366baaca73a828f190372
This commit is contained in:
Richard Peter 2015-10-09 18:02:09 -05:00 • committed by Gerrit Code Review
commit 6b15c36033
5 changed files with 232 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -230,4 +230,5 @@
<alias base="FFG-TAR">RFCFFG_ParameterInfo</alias>
<alias base="FFG-TIR">RFCFFG_ParameterInfo</alias>
<alias base="FFG-TUA">RFCFFG_ParameterInfo</alias>
<alias base="NationalBlend">NationalBlend</alias>
</aliasList>

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

@ -11,8 +11,10 @@
Feb 24, 2015 DR 16671 byin Added HPBL for RUC13
May 21, 2015 DR 17515 bhunder Added parameters for URMA25
Jun 29, 2015 #4537 rferrel Added parameters for HRRR.
Oct 08, 2015 #4958 dgilling Added parameters for NationalBlend.
-->
<aliasList caseSensitive="true" namespace="gfeParamName">
<alias base="APTMP">aptmp</alias>
<alias base="AV">av</alias>
<alias base="CAPE">cape</alias>
<alias base="CFRZR">cfrzr</alias>

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

@ -68,6 +68,7 @@
# 05/29/2015 17496 ryu Changed parm definitions for Wave1-10 and Period1-10.
#
# 05/29/2015 #17144 bhunder Added weather Params for URMA25 and OCONUS RTMA
# 10/07/2015 #4958 dgilling Added support for NationalBlend D2D data.
####################################################################################################
#----------------------------------------------------------------------------
@ -1351,6 +1352,7 @@ elif SID in CONUS_EAST_SITES:
('FFG-TAR', 'FFGTAR'),
('FFG-TIR', 'FFGTIR'),
('FFG-TUA', 'FFGTUA'),
'NationalBlend',
]
else: #######DCS3501 WEST_CONUS
@ -1430,6 +1432,7 @@ else: #######DCS3501 WEST_CONUS
('FFG-TAR', 'FFGTAR'),
('FFG-TIR', 'FFGTIR'),
('FFG-TUA', 'FFGTUA'),
'NationalBlend',
]
if SID in GreatLake_SITES:

220
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/NationalBlend.xml Normal file
View file

@ -0,0 +1,220 @@
<?xml version="1.0" encoding="UTF-8"?>
<gridParamInfo xmlns:ns2="group">
<valtimeMINUSreftime>
<fcst>0</fcst>
<fcst>10800</fcst>
<fcst>21600</fcst>
<fcst>32400</fcst>
<fcst>43200</fcst>
<fcst>54000</fcst>
<fcst>64800</fcst>
<fcst>75600</fcst>
<fcst>86400</fcst>
<fcst>97200</fcst>
<fcst>108000</fcst>
<fcst>118800</fcst>
<fcst>129600</fcst>
<fcst>140400</fcst>
<fcst>151200</fcst>
<fcst>162000</fcst>
<fcst>172800</fcst>
<fcst>183600</fcst>
<fcst>194400</fcst>
<fcst>205200</fcst>
<fcst>216000</fcst>
<fcst>226800</fcst>
<fcst>237600</fcst>
<fcst>248400</fcst>
<fcst>259200</fcst>
<fcst>270000</fcst>
<fcst>280800</fcst>
<fcst>291600</fcst>
<fcst>302400</fcst>
<fcst>313200</fcst>
<fcst>324000</fcst>
<fcst>334800</fcst>
<fcst>345600</fcst>
<fcst>356400</fcst>
<fcst>367200</fcst>
<fcst>378000</fcst>
<fcst>388800</fcst>
<fcst>399600</fcst>
<fcst>410400</fcst>
<fcst>421200</fcst>
<fcst>432000</fcst>
<fcst>442800</fcst>
<fcst>453600</fcst>
<fcst>464400</fcst>
<fcst>475200</fcst>
<fcst>486000</fcst>
<fcst>496800</fcst>
<fcst>507600</fcst>
<fcst>518400</fcst>
<fcst>529200</fcst>
<fcst>540000</fcst>
<fcst>550800</fcst>
<fcst>561600</fcst>
<fcst>572400</fcst>
<fcst>583200</fcst>
<fcst>594000</fcst>
<fcst>604800</fcst>
<fcst>615600</fcst>
<fcst>626400</fcst>
<fcst>637200</fcst>
<fcst>648000</fcst>
<fcst>658800</fcst>
<fcst>669600</fcst>
<fcst>680400</fcst>
<fcst>691200</fcst>
</valtimeMINUSreftime>
<gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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>-999999.0</fillValue>
<n3D>1</n3D>
<levelsDesc>2 FHAG</levelsDesc>
<levels>
<level>FHAG2</level>
</levels>
</gridParameterInfo>
<gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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>-999999.0</fillValue>
<n3D>1</n3D>
<levelsDesc>FHAG 2</levelsDesc>
<levels>
<level>FHAG2</level>
</levels>
</gridParameterInfo>
<gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
<short_name>mnt12hr</short_name>
<long_name>Minimum Temperature</long_name>
<units>K</units>
<udunits>degree_Kelvin</udunits>
<uiname>minT</uiname>
<valid_range>180.0</valid_range>
<valid_range>330.0</valid_range>
<fillValue>-999999.0</fillValue>
<n3D>1</n3D>
<levelsDesc>FHAG 2</levelsDesc>
<levels>
<level>FHAG2</level>
</levels>
</gridParameterInfo>
<gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
<short_name>mxt12hr</short_name>
<long_name>Maximum Temperature</long_name>
<units>K</units>
<udunits>degree_Kelvin</udunits>
<uiname>maxT</uiname>
<valid_range>180.0</valid_range>
<valid_range>330.0</valid_range>
<fillValue>-999999.0</fillValue>
<n3D>1</n3D>
<levelsDesc>FHAG 2</levelsDesc>
<levels>
<level>FHAG2</level>
</levels>
</gridParameterInfo>
<gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
<short_name>pop</short_name>
<long_name>Probability of 12hr precip</long_name>
<units>%</units>
<udunits>percent</udunits>
<uiname>12hrPcpProb</uiname>
<valid_range>0.0</valid_range>
<valid_range>100.0</valid_range>
<fillValue>-999999.0</fillValue>
<n3D>0</n3D>
<levelsDesc>SFC</levelsDesc>
<levels>
<level>SFC</level>
</levels>
</gridParameterInfo>
<gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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>-999999.0</fillValue>
<n3D>0</n3D>
<levelsDesc>SFC</levelsDesc>
<levels>
<level>SFC</level>
</levels>
</gridParameterInfo>
<gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
<short_name>ws</short_name>
<long_name>Wind Speed</long_name>
<units>m/s</units>
<udunits>meter/sec</udunits>
<uiname>windSpeed</uiname>
<valid_range>-150.0</valid_range>
<valid_range>150.0</valid_range>
<fillValue>-999999.0</fillValue>
<n3D>1</n3D>
<levelsDesc>FHAG 10</levelsDesc>
<levels>
<level>FHAG10</level>
</levels>
</gridParameterInfo>
<gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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>-999999.0</fillValue>
<n3D>1</n3D>
<levelsDesc>FHAG 10</levelsDesc>
<levels>
<level>FHAG10</level>
</levels>
</gridParameterInfo>
<gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
<short_name>rh</short_name>
<long_name>Relative Humidity</long_name>
<units>%</units>
<udunits>percent</udunits>
<uiname>rh</uiname>
<valid_range>0.0</valid_range>
<valid_range>100.0</valid_range>
<fillValue>-999999.0</fillValue>
<n3D>1</n3D>
<levelsDesc>FHAG 2</levelsDesc>
<levels>
<level>FHAG2</level>
</levels>
</gridParameterInfo>
<gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
<short_name>aptmp</short_name>
<long_name>Apparent Temperature</long_name>
<units>K</units>
<udunits>degree_Kelvin</udunits>
<uiname>aptmp</uiname>
<valid_range>180.0</valid_range>
<valid_range>330.0</valid_range>
<fillValue>-999999.0</fillValue>
<n3D>1</n3D>
<levelsDesc>2 FHAG</levelsDesc>
<levels>
<level>FHAG2</level>
</levels>
</gridParameterInfo>
</gridParamInfo>

5
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
View file

@ -41,6 +41,7 @@
#20150202 4066 rferrel Add pattern form Earth Networks Total Lightning: SFPA42
#20150507 4434 skorolev Add pattern for GFS20
#20150820 DR 17915 mporricelli Add pattern for GFS229 (1 deg GFS)
#20151008 4958 dgilling Add pattern for NationalBlend
#***************************************************************
# AWIPS 1 PATTERN GRAPHIC ^[PQ].* /redbook/Raw
# PGNA00 KWNS 010001 !redbook 1_1/NMCGPHMCD/MCDSUM/PXSF001CN/20110201 0001
@ -846,3 +847,7 @@ ANY ^(NWUS64) KWNS (..)(..)(..)
EXP (.*wcl_decrypted.*)
FILE -overwrite -log -close -edex \1
# DR 4958: NationalBlend model
NGRID ^(L[ABCDEFGHRTW]AZ9[0-9]) (KWEA) (..)(..)(..)[^!]*!(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