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

LDM pqact and ingestGrib product updates

Browse source 
Former-commit-id: 0ad5759403 [formerly c779c551ca] [formerly 1de9ff057fc9c0861669617590900416db26bf37 [formerly 3c41589061]]
Former-commit-id: d130b42517394e3d33bac534c0ce6faa2364e28b [formerly 835f0e0f02]
Former-commit-id: 877f18c243
This commit is contained in:
mjames-upc 2015-04-28 16:01:39 -06:00
parent 08482d613c
commit ba867739be
4 changed files with 148 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cave/com.raytheon.viz.volumebrowser/localization/menus/volume/ModelFamilies.xml
View file

@ -883,7 +883,7 @@
</contribute>
<contribute xsi:type="bundleItem" file="bundles/volume/ModelFamilyM.xml"
menuText="DGEX" id="DGEX" useReferenceTime="true">
<substitute key="modelName" value="DGEX"/>
<substitute key="modelName" value="DGEX185"/>
<substitute key="TP" value="TP"/>
<substitute key="frameCount" value="41"/>
</contribute>

2
cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseFamilies.xml
View file

@ -34,7 +34,7 @@
</contribute>
<contribute xsi:type="bundleItem" file="bundles/volume/DefaultFamily.xml"
menuText="DGEX" id="DGEX" useReferenceTime="true">
<substitute key="modelName" value="DGEX"/>
<substitute key="modelName" value="DGEX185"/>
<substitute key="TP" value="TP"/>
<substitute key="frameCount" value="41"/>
</contribute>

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

@ -1090,7 +1090,7 @@
</model>
<model>
<name>GFS230</name>
<name>GFS</name>
<center>7</center>
<subcenter>0</subcenter>
<grid>230</grid>
@ -1122,7 +1122,7 @@
</model>
<model>
<name>RTMA</name>
<name>RTMA-5km</name>
<center>7</center>
<subcenter>4</subcenter>
<grid>197</grid>
@ -1132,7 +1132,7 @@
</model>
<model>
<name>RTMA-Mosaic</name>
<name>RTMA</name>
<center>7</center>
<subcenter>0</subcenter>
<grid>184</grid>
@ -1161,6 +1161,17 @@
</process>
</model>
<model>
<name>NamDNG</name>
<center>7</center>
<subcenter>0</subcenter>
<grid>184</grid>
<process>
<id>89</id>
</process>
</model>
<model>
<name>RaobOA</name>
<center>7</center>
@ -1341,7 +1352,7 @@
</model>
<model>
<name>Aviation</name>
<name>Aviation-0-252</name>
<center>7</center>
<subcenter>0</subcenter>
<grid>252</grid>
@ -1708,7 +1719,7 @@
</model>
<model>
<name>GFS-1p0</name>
<name>GFS</name>
<center>7</center>
<subcenter>0</subcenter>
<grid>229</grid>
@ -1843,11 +1854,22 @@
<name>NDFD</name>
<center>8</center>
<subcenter>65535</subcenter>
<grid>184</grid>
<process>
<id>0</id>
</process>
</model>
<model>
<name>NDFD-5km</name>
<center>8</center>
<subcenter>65535</subcenter>
<grid>197</grid>
<process>
<id>0</id>
</process>
</model>
<model>
<name>NAM-90km</name>
<center>7</center>
@ -2380,7 +2402,7 @@
</model>
<model>
<name>SREF-40km</name>
<name>SREF-40km-2</name>
<center>7</center>
<subcenter>2</subcenter>
<grid>212</grid>
@ -2393,7 +2415,7 @@
</model>
<model>
<name>SREF-40km</name>
<name>SREF-40km-0</name>
<center>7</center>
<subcenter>0</subcenter>
<grid>212</grid>
@ -2524,7 +2546,7 @@
</model>
<model>
<name>RTMA-2p5km</name>
<name>RTMA-NWRFC</name>
<center>7</center>
<subcenter>4</subcenter>
<grid>118</grid>
@ -2545,7 +2567,7 @@
</model>
<model>
<name>RTMA-Mosaic</name>
<name>RTMA</name>
<center>7</center>
<subcenter>4</subcenter>
<grid>184</grid>
@ -3036,7 +3058,7 @@
<!-- SUBCENTER 8: AVIATION WEATHER CENTER -->
<model>
<name>Aviation</name>
<name>Aviation-8-130</name>
<center>7</center>
<subcenter>8</subcenter>
<grid>130</grid>
@ -3046,7 +3068,7 @@
</model>
<model>
<name>Aviation</name>
<name>Aviation-8-252</name>
<center>7</center>
<subcenter>8</subcenter>
<grid>252</grid>

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

@ -1,50 +1,102 @@
LIGHTNING USPLN1EX
FILE -close -log -edex /awips2/data_store/lightning/%Y%m%d%H%M.uspln
# GFS 2.5 deg (#004)
CONDUIT ^data/nccf/com/.*gfs.t[0-9][0-9]z.(pgrb2.2p50).*!(grib2)/[^/]*/(SSIGFS|GFS)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]..)/([^/]*)/.*! (......)
FILE -overwrite -log -close -edex /awips2/data_store/grib2/GFS/\5_\6Z_\7_\8-(seq).\1.\2.%Y%m%d
FILE -overwrite -log -close -edex /awips2/data_store/grib2/conduit/GFS/\5_\6Z_\7_\8-(seq).\1.\2.%Y%m%d
# GFS 1.0 deg
CONDUIT ^data/nccf/com/.*gfs.t[0-9][0-9]z.(pgrb2.1p00).*!(grib2)/[^/]*/(SSIGFS|GFS)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]..)/([^/]*)/.*! (......)
FILE -overwrite -log -close -edex /awips2/data_store/grib2/GFS/\5_\6Z_\7_\8-(seq).\1.\2.%Y%m%d
#CONDUIT ^data/nccf/com/.*gfs.t[0-9][0-9]z.(pgrb2.1p00).*!(grib2)/[^/]*/(SSIGFS|GFS)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]..)/([^/]*)/.*! (......)
# FILE -overwrite -log -close -edex /awips2/data_store/grib2/conduit/GFS/\5_\6Z_\7_\8-(seq).\1.\2.%Y%m%d
# GFS 0.5 deg = *pgrb2f (all hours out to F192)
#CONDUIT ^data/nccf/com/.*gfs.t[0-9][0-9]z.(pgrb2.0p50).*!(grib2)/[^/]*/(SSIGFS|GFS)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]..)/([^/]*)/.*! (......)
# FILE -overwrite -log -close -edex /awips2/data_store/grib2/GFS/\5_\6Z_\7_\8-(seq).\1.\2.%Y%m%d
CONDUIT ^data/nccf/com/.*gfs.t[0-9][0-9]z.(pgrb2.0p50).*!(grib2)/[^/]*/(SSIGFS|GFS)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]..)/([^/]*)/.*! (......)
FILE -overwrite -log -close -edex /awips2/data_store/grib2/conduit/GFS/\5_\6Z_\7_\8-(seq).\1.\2.%Y%m%d
# NAM-40km (awip3d) and AK-NAM-45km (exclude awip12 = NAM-12km since it is on NGRID) (exclude NAM 90km)
# NAM-40km (awip3d) - exclude awip12 = NAM-12km since it is on NGRID (exclude NAM 90km)
CONDUIT ^data/nccf/com/nam/.*nam.*(awip3d).*!(grib2)/ncep/(NAM_84)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-1]..)/([^/]*)/.*! (......)
FILE -overwrite -log -close -edex /awips2/data_store/grib2/\3/\5_\6Z_\7_\8-(seq).\1.\2.%Y%m%d
FILE -overwrite -log -close -edex /awips2/data_store/grib2/conduit/\3/\5_\6Z_\7_\8-(seq).\1.\2.%Y%m%d
# RAP252 (RAP-20km) (disable 40km RAP236)
CONDUIT ^data/nccf/com/rap/prod/rap.*(awp252).*!(grib2)/ncep/(.*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-1]..)/([^/]*)/.*! (......)
FILE -overwrite -log -close -edex /awips2/data_store/grib2/GRID\4/\3/\5_\6Z_\7_\8-(seq).\1.\2.%Y%m%d
#CONDUIT ^data/nccf/com/rap/prod/rap.*(awp252).*!(grib2)/ncep/(.*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-1]..)/([^/]*)/.*! (......)
# FILE -overwrite -log -close -edex /awips2/data_store/grib2/conduit/GRID\4/\3/\5_\6Z_\7_\8-(seq).\1.\2.%Y%m%d
# GEFS - off for now, NCP isn't displaying them as members of ensemble yet.
#CONDUIT (data/nccf|data2/TIGGE).*/(ge[cp][0-9][0-9])\.t[0-2][0-9]z\.pgrb2.* !grib2/ncep/GEFS/#000/([0-9]{8})([0-9]{4})(F[0-1]..)/([^/]*)/.*! (......)
# FILE -overwrite -log -close -edex /awips2/data_store/grib2/GEFS/gefs_\3_\4_\5\6_\2.grib2
# GEFS
CONDUIT (data/nccf|data2/TIGGE).*/(ge[cp][0-9][0-9])\.t[0-2][0-9]z\.pgrb2.* !grib2/ncep/GEFS/#000/([0-9]{8})([0-9]{4})(F[0-1]..)/([^/]*)/.*! (......)
FILE -overwrite -log -close -edex /awips2/data_store/grib2/conduit/GEFS/gefs_\3_\4_\5\6_\2.grib2
# NDFD
#CONDUIT grib2/nwstg/NWS_0/..../(........)(....)
# FILE -overwrite -log -close -edex /awips2/data_store/grib2/NDFD/ndfd_\1_\2-(seq).grib2.%Y%m%d
CONDUIT grib2/nwstg/NWS_0/..../(........)(....)
FILE -overwrite -log -close -edex /awips2/data_store/grib2/conduit/NDFD/ndfd_\1_\2-(seq).grib2.%Y%m%d
# FNMOC
#FNMOC US058GMET-GR1mdl.0018_0056_00300F0RL2014070500_0100_000040-000000wnd_ucmp
FNMOC ^US058.*(0018_0056|0022_0179|0027_0186|0060_0188|0063_0187|0110_0240|0111_0179|0135_0240|0078_0200)_(.*)_(.*)_(.*)-.*
FILE -log -overwrite -close -edex /awips2/data_store/grib2/FNMOC-NAVGEM/US_058_\1_\2_\3_\4-(seq).grib.%Y%m%d
FILE -log -overwrite -close -edex /awips2/data_store/grib2/fnmoc/US_058_\1_\2_\3_\4-(seq).grib.%Y%m%d
#
# NOAAport Grids
#
# ALL
#NGRID ^([LM]...{1,3}) (KWB.) (..)(..)(..)[^!]*!(grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*)
# FILE -overwrite -log -close -edex /awips2/data_store/grib2/noaaport/GRID\8/\7/\7_\9_\(10)Z_\(11)_\(12)-\1_\2_(seq).\6.%Y%m%d
# DGEX
NGRID ^[LM].E... KWBD ...... !grib2/[^/]*/([^/]*)/#[^/]*/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*)
FILE -overwrite -log -close -edex /awips2/data_store/grib2/noaaport/DGEX/\1_\2_\3Z_\4_\5-(seq).grib2.%Y%m%d
# NOAAport HRRR
NGRID Y.C.[0-9][0-9] KWBY ...... !grib2/[^/]*/[^/]*/#[^/]*/([0-9]{12})F(...)/(.*)/.*
FILE -overwrite -log -close -edex /awips2/data_store/grib2/noaaport/HRRR/\1_F\2_\3_(seq).%Y%m%d.grib2
# GFS201 (NH)
#NGRID ^[LM].A... KWBC ...... !grib2/[^/]*/([^/]*)/#(201)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*)
# FILE -overwrite -log -close -edex /awips2/data_store/grib2/noaaport/GRID\2/\1_\3_\4Z_\5_\6-(seq).grib2.%Y%m%d
# GFS212 40km
NGRID ^[LM].R... KWBC ...... !grib2/[^/]*/([^/]*)/#(212)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*)
FILE -overwrite -log -close -edex /awips2/data_store/grib2/noaaport/GRID\2/\1_\3_\4Z_\5_\6-(seq).grib2.%Y%m%d
# GFS213 95km
#NGRID ^[LM].H... KWBC ...... !grib2/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*)
# FILE -overwrite -log -close -edex /awips2/data_store/grib2/noaaport/GRID\2/\1_\3_\4Z_\5_\6-(seq).grib2.%Y%m%d
# GFSGuide
NGRID ^[LM].I... KWBJ ...... !grib2/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*)
FILE -overwrite -log -close -edex /awips2/data_store/grib2/noaaport/GRID\2/\1_\3_\4Z_\5_\6-(seq).grib2.%Y%m%d
# RAP-13km
NGRID ^[LM].D... KWBG ...... !grib2/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*)
FILE -overwrite -log -close -edex /awips2/data_store/grib2/noaaport/GRID\2/\1_\3_\4Z_\5_\6-(seq).grib2.%Y%m%d
# RTMA 197 (5km)
NGRID ^[LM].M... KWBR ...... !grib2/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*)
FILE -overwrite -log -close -edex /awips2/data_store/grib2/noaaport/GRID\2/\1_\3_\4Z_\5_\6-(seq).grib2.%Y%m%d
# RTMA-Mosaic 2.5km (I) and URMA2.5 (Q)
NGRID ^[LM].[IQ]... KWBR ...... !grib2/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*)
FILE -overwrite -log -close -edex /awips2/data_store/grib2/noaaport/GRID\2/\1_\3_\4Z_\5_\6-(seq).grib2.%Y%m%d
# NamDNG 2.5 and 5km
NGRID ^[LM].[IM]... KWBE ...... !grib2/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*)
FILE -overwrite -log -close -edex /awips2/data_store/grib2/noaaport/GRID\2/\1_\3_\4Z_\5_\6-(seq).grib2.%Y%m%d
# NAM-12km (#218)
NGRID ^[LM].B... KWBE ...... !grib2/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*)
FILE -overwrite -log -close -edex /awips2/data_store/grib2/noaaport/GRID\2/\1_\3_\4Z_\5_\6-(seq).grib2.%Y%m%d
# almost all of NGRID
# 003 | 197 | 201 | 212 | 215 | 218 | 130 | 255
# gefs | rtma | gfs-NH | gfs-40km | gfs??? | NAM-12km | RAP-13km | RTMA2p5, region RTMA, WRF_EM, WRF_NMM, "118", AK-NamDNG5, more...
#NGRID ^([LM].[ABDHIMNRSTU].{1,3}) (KWB.) (..)(..)(..)[^!]*!(grib2)/[^/]*/([^/]*)/#(003|197|201|212|215|218|130)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*)
# FILE -overwrite -log -close -edex /awips2/data_store/grib2/noaaport/GRID\8/\7/\7_\9_\(10)Z_\(11)_\(12)-\1_\2_(seq).\6.%Y%m%d
#
# NGRID 255
# on: WRF_NMM, WRF_EM (east/west),
# off: Hawaii-NamDNG5, AK-NamDNG5, AK-RTMA,
#NGRID ^([LM].[ABDHIMNRSTU].{1,3}) (KWB.) (..)(..)(..)[^!]*!(grib2)/[^/]*/()/#(255)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*)
# FILE -overwrite -log -close -edex /awips2/data_store/grib2/noaaport/GRID\8/\7/\7_\9_\(10)Z_\(11)_\(12)-\1_\2_(seq).\6.%Y%m%d
#
# all (most) of NGRID
NGRID ^([LM].[ABDHMNRSTU].{1,3}) (KWB.) (..)(..)(..)[^!]*!(grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*)
FILE -overwrite -log -close -edex /awips2/data_store/grib2/noaaport/GRID\8/\7_\9_\(10)Z_\(11)_\(12)-\1_\2_(seq).\6.%Y%m%d
# LAMP MOS grid
#NGRID ^([LM].[ABDHMNRSTU].{1,3}) (KWNO|KMDL) (..)(..)(..)[^!]*!(grib2)/[^/]*/(LAMP)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*)
# FILE -overwrite -log -close -edex /awips2/data_store/grib2/noaaport/GRID\8/\7_\9_\(10)Z_\(11)_\(12)-\1_\2_(seq).\6.%Y%m%d
# NOAAport HRRR ( 1 ) ( 2) ( 3 ) ( 4 ) ( 5)
NGRID Y.C.[0-9][0-9] KWBY ...... !grib2/ncep/(HRRR)/#(.*)/([0-9]{12})F(...)/(.*)/.*
FILE -overwrite -log -close -edex /awips2/data_store/grib2/noaaport/\1/\3_F\4_\5_(seq).%Y%m%d
# CMC GEM model
CMC CMC_reg_(.*)km_(..........).*.grib2
FILE -overwrite -log -close -edex /awips2/data_store/grib2/cmc/\2/cmc_reg_\1km_\2.grib2
# GEM 000 CMC_reg_USWRF_NTAT_0_ps15km_2015042818_P003.grib2
CMC CMC_reg_(.*)km_(..........)_P(...).grib2
FILE -overwrite -log -close -edex /awips2/data_store/grib2/cmc/cmc_reg_\1km_\2_P\3.grib2
# All text products (?)
DDPLUS|IDS ^([A-Z][A-Z]{3}[0-9]{2}) ([KPTMC].{3}) (..)(..)(..)
FILE -overwrite -close -edex /awips2/data_store/text/\3_\4_\1_\2_\3\4\5_(seq).%Y%m%d%h
FILE -overwrite -close -edex /awips2/data_store/TEXT/\3_\4_\1_\2_\3\4\5_(seq).%Y%m%d%h
#NOAAPORT GINI images
NIMAGE ^satz/ch[0-9]/.*/(.*)/([12][0-9])([0-9][0-9])([01][0-9])([0-3][0-9]) ([0-2][0-9])([0-5][0-9])/(.*)/(.*km)/
@ -57,12 +109,12 @@ FNEXRAD ^rad/NEXRCOMP/(...)/(...)_(........)_(....)
# NEXRAD3
# full feed
NEXRAD3 ^(SDUS[23578].) .... (......) /p(...)(...)
FILE -overwrite -close -edex /awips2/data_store/radar/\4/\3/\1_\4_\3_\2_(seq).rad
#NEXRAD3 ^(SDUS[23578].) .... (......) /p(...)(...)
# FILE -overwrite -close -edex /awips2/data_store/radar/\4/\3/\1_\4_\3_\2_(seq).rad
# partial feed
#NEXRAD3 ^(SDUS[23578].) .... (......) /p(DHR|DPR|DSP|DU3|DU6|DVL|EET|HHC|N0Q|N0S|N0U|N0X|N0Z|NCR|NMD|OHA)(...)
# FILE -overwrite -close -edex /awips2/data_store/radar/\4/\3/\1_\4_\3_\2_(seq).rad
NEXRAD3 ^(SDUS[23578].) .... (......) /p(DHR|DPR|DSP|DTA|DAA|DU3|DU6|DVL|EET|HHC|N3P|N0C|N0K|N0Q|N0S|N0U|N0X|N0Z|NCR|NMD|OHA)(...)
FILE -overwrite -close -edex /awips2/data_store/radar/\4/\3/\1_\4_\3_\2_(seq).rad
#
# Redbook graphics
@ -136,7 +188,38 @@ HDS ^(JSXX(0[1-9]|10)) (.{4}) (..)(..)(..)
# AWIPS2 distribution file bufrmthdw.xml: ^JUTX(([2-4]1)|53).*
HDS ^(JUTX(([2-4]1)|53)) (.{4}) (..)(..)(..)
FILE -overwrite -log -close -edex /awips2/data_store/bufrmthdw/\1_\4_\5\6\7_(seq).bufr.%Y%m%d%H
# NOTHER 32563 TIPB05 KNES 091834
#
# Ocean SST, Grids #61-64
#
HDS ^H.[T-W]
FILE -close -log -edex /awips2/data_store/grib2/sst/%Y%m%d%H%M.sst.grib2
#
# NOAA Wave Watch III
#
# GWW233
HDS ^O.J.88 KWBJ.*!grib/ncep/([^/]*)/#([^/]*)/(............)/F(...)/.*
FILE -close -log -edex /awips2/data_store/grib2/nww/\1/\1_\2_\3_F\4_%H%M%S.grib
# AKWAVE239
HDS ^O.N.88 KWBJ.*!grib/ncep/([^/]*)/#([^/]*)/(............)/F(...)/.*
FILE -close -log -edex /awips2/data_store/grib2/nww/\1/\1_\2_\3_F\4_%H%M%S.grib
# ENPWAVE253
HDS ^O.S.88 KWBJ.*!grib/ncep/([^/]*)/#([^/]*)/(............)/F(...)/.*
FILE -close -log -edex /awips2/data_store/grib2/nww/\1/\1_\2_\3_F\4_%H%M%S.grib
# HurWave238
HDS ^O.O.88 KWBJ.*!grib/ncep/([^/]*)/#([^/]*)/(............)/F(...)/.*
FILE -close -log -edex /awips2/data_store/grib2/nww/\1/\1_\2_\3_F\4_%H%M%S.grib
# WNAWAVE238
HDS ^O.M.88 KWBJ.*!grib/ncep/([^/]*)/#([^/]*)/(............)/F(...)/.*
FILE -close -log -edex /awips2/data_store/grib2/nww/\1/\1_\2_\3_F\4_%H%M%S.grib
# HurWave253
HDS ^O.Q.88 KWBJ.*!grib/ncep/([^/]*)/#([^/]*)/(............)/F(...)/.*
FILE -close -log -edex /awips2/data_store/grib2/nww/\1/\1_\2_\3_F\4_%H%M%S.grib
# GLERL
HDS ^O.N.88 KWNB.*!grib/161/([^/]*)/#([^/]*)/(............)/F(...)/.*
FILE -close -log -edex /awips2/data_store/grib2/glerl/\1/\1_\2_\3_F\4_%H%M%S.grib
#
# NOTHER 32563 TIPB05 KNES 091834 - AK VIIRS
#
NOTHER ^(TIP...) (KNES) (......)
FILE -close -log -edex
/data_store/viirs/\1_\2_\3