Issue #2765 Fix aliases for probability parameters.
Former-commit-id:43a8b80ef2[formerly 11bbfb8275cfafb411d1d5d9732b021f0011712a] Former-commit-id:0bb18f2cd7
This commit is contained in:
Ben Steffensmeier
parent
42fdfa4964
commit
eb9c4ef999
7 changed files with 101 additions and 99 deletions
|
|
@ -105,8 +105,8 @@ THINNED_GRID_VALUES = THINNED_GRID_PT_MAP.values()
|
|||
logHandler = UFStatusHandler.UFStatusHandler("com.raytheon.edex.plugin.grib", "EDEX")
|
||||
|
||||
#
|
||||
# Python implementation of the grib decoder. This decoder uses the python ctypes
|
||||
# library to access the NCEP grib decoder for extracting data
|
||||
# Python implementation of the grib decoder. This decoder uses the grib2 module
|
||||
# to access the NCEP grib decoder for extracting data
|
||||
#
|
||||
#
|
||||
# SOFTWARE HISTORY
|
||||
|
|
@ -121,6 +121,8 @@ logHandler = UFStatusHandler.UFStatusHandler("com.raytheon.edex.plugin.grib", "E
|
|||
# UFStatusHandler.
|
||||
# Sep 06, 2013 2402 bsteffen Switch to use file extents for multipart
|
||||
# grib files.
|
||||
# Feb 11, 2014 2765 bsteffen Better handling of probability parameters.
|
||||
#
|
||||
class GribDecoder():
|
||||
|
||||
##
|
||||
|
|
@ -513,7 +515,6 @@ class GribDecoder():
|
|||
#statisticalProcess = pdsTemplate[25]
|
||||
|
||||
elif pdsTemplateNumber == 5 or pdsTemplateNumber == 9:
|
||||
gribDict['parameterUnit'] = "%"
|
||||
probabilityNumber = pdsTemplate[15]
|
||||
forecastProbabilities = pdsTemplate[16]
|
||||
probabilityType = pdsTemplate[17]
|
||||
|
|
@ -533,10 +534,13 @@ class GribDecoder():
|
|||
scaledValue = None
|
||||
if(probabilityType == 1 or probabilityType ==2):
|
||||
scaledValue = self._convertScaledValue(scaledValueUL, scaleFactorUL)
|
||||
gribDict['parameterName'] = "Prob of " + gribDict['parameterName'] + " > " + str(scaledValue) + gribDict['parameterUnit']
|
||||
else:
|
||||
scaledValue = self._convertScaledValue(scaledValueLL, scaleFactorLL)
|
||||
parameterAbbreviation = parameterAbbreviation + str(scaledValue) + "m"
|
||||
gribDict['parameterName'] = "Prob of " + gribDict['parameterName'] + " < " + str(scaledValue) + gribDict['parameterUnit']
|
||||
parameterAbbreviation = parameterAbbreviation + str(scaledValue) + gribDict['parameterUnit']
|
||||
|
||||
gribDict['parameterUnit'] = "%"
|
||||
|
||||
elif pdsTemplateNumber == 8:
|
||||
gribDict['endTime'] = self._convertToCalendar(pdsTemplate, 15)
|
||||
|
|
@ -547,6 +551,7 @@ class GribDecoder():
|
|||
|
||||
elif pdsTemplateNumber == 10:
|
||||
parameterAbbreviation = parameterAbbreviation + str(pdsTemplate[15]) + "pct"
|
||||
gribDict['parameterName'] = str(pdsTemplate[15]) +"th percentile " + gribDict['parameterName']
|
||||
gribDict['endTime'] = self._convertToCalendar(pdsTemplate, 16)
|
||||
|
||||
#numTimeRanges = pdsTemplate[22]
|
||||
|
|
|
|||
|
|
@ -50,12 +50,12 @@ ThP_T170L42A-NCEP-MDL_1073x689_21600-0 ThP6hr
|
|||
ThP_T170L42A-NCEP-MDL_1073x689_10800-0 ThP3hr
|
||||
TP_254E3_T170L42A-NCEP-MDL_1649x1105_21600-0 POP6hr
|
||||
TP_254E3_T170L42A-NCEP-MDL_1649x1105_43200-0 POP12hr
|
||||
WS_17491E3 Prob34
|
||||
WS_25722E3 Prob50
|
||||
WS_32924E3 Prob64
|
||||
PWS34_17491E3 PWS34
|
||||
PWS50_25722E3 PWS50
|
||||
PWS64_32924E3 PWS64
|
||||
WS17.491m/s Prob34
|
||||
WS25.722m/s Prob50
|
||||
WS32.924m/s Prob64
|
||||
PWS17.491m/s PWS34
|
||||
PWS25.722m/s PWS50
|
||||
PWS32.924m/s PWS64
|
||||
MxT_ECMFMOD-1DEG-ECMF_10800-0 MxT3hr
|
||||
MxT_ECMFMOD-1DEG-ECMF_21600-0 MxT6hr
|
||||
MnT_ECMFMOD-1DEG-ECMF_10800-0 MnT3hr
|
||||
|
|
@ -74,72 +74,72 @@ TPmean_43200-0 TP12mean
|
|||
TPsprd_43200-0 TP12sprd
|
||||
TPmean_86400-0 TP24mean
|
||||
TPsprd_86400-0 TP24sprd
|
||||
Vis_1609000E3 Visc1
|
||||
Vis_4827000E3 Visc2
|
||||
WS_12890E3 WSc1
|
||||
WS_17500E3 WSc2
|
||||
WS_25700E3 WSc3
|
||||
WS_25780E3 WSc4
|
||||
GH_152500E3 Cigc1
|
||||
GH_305000E3 Cigc2
|
||||
GH_914600E3 Cigc3
|
||||
T_273000E3 Tc1
|
||||
CAPE_500000E3 CAPEc1
|
||||
CAPE_1000000E3 CAPEc2
|
||||
CAPE_2000000E3 CAPEc3
|
||||
CAPE_3000000E3 CAPEc4
|
||||
CAPE_4000000E3 CAPEc5
|
||||
CFRZR_1000E3 CFRZRc1
|
||||
CICEP_1000E3 CICEPc1
|
||||
CRAIN_1000E3 CRAINc1
|
||||
CSNOW_1000E3 CSNOWc1
|
||||
PLI_0E3 PLIxc1
|
||||
PLI_-2000E3 PLIxc2
|
||||
PLI_-4000E3 PLIxc3
|
||||
PLI_-6000E3 PLIxc4
|
||||
PLI_-8000E3 PLIxc5
|
||||
TP_250E3_10800-0 tp3c1
|
||||
TP_1270E3_10800-0 tp3c2
|
||||
TP_2540E3_10800-0 tp3c3
|
||||
TP_6350E3_10800-0 tp3c4
|
||||
TP_12700E3_10800-0 tp3c5
|
||||
TP_25400E3_10800-0 tp3c6
|
||||
TP_38100E3_10800-0 tp3c7
|
||||
TP_50800E3_10800-0 tp3c8
|
||||
TP_250E3_21600-0 tp6c1
|
||||
TP_1270E3_21600-0 tp6c2
|
||||
TP_2540E3_21600-0 tp6c3
|
||||
TP_6350E3_21600-0 tp6c4
|
||||
TP_12700E3_21600-0 tp6c5
|
||||
TP_25400E3_21600-0 tp6c6
|
||||
TP_38100E3_21600-0 tp6c7
|
||||
TP_50800E3_21600-0 tp6c8
|
||||
TP_250E3_43200-0 tp12c1
|
||||
TP_1270E3_43200-0 tp12c2
|
||||
TP_2540E3_43200-0 tp12c3
|
||||
TP_6350E3_43200-0 tp12c4
|
||||
TP_12700E3_43200-0 tp12c5
|
||||
TP_25400E3_43200-0 tp12c6
|
||||
TP_38100E3_43200-0 tp12c7
|
||||
TP_50800E3_43200-0 tp12c8
|
||||
TP_250E3_86400-0 tp24c1
|
||||
TP_1270E3_86400-0 tp24c2
|
||||
TP_2540E3_86400-0 tp24c3
|
||||
TP_6350E3_86400-0 tp24c4
|
||||
TP_12700E3_86400-0 tp24c5
|
||||
TP_25400E3_86400-0 tp24c6
|
||||
TP_38100E3_86400-0 tp24c7
|
||||
TP_50800E3_86400-0 tp24c8
|
||||
SNOL_25400E3_43200-0 SNOL12c1
|
||||
SNOL_50800E3_43200-0 SNOL12c2
|
||||
SNOL_101600E3_43200-0 SNOL12c3
|
||||
SNOL_152400E3_43200-0 SNOL12c4
|
||||
SNOL_190500E3_43200-0 SNOL12c5
|
||||
SNOL_203200E3_43200-0 SNOL12c6
|
||||
SNOL_254000E3_43200-0 SNOL12c7
|
||||
SNOL_304800E3_43200-0 SNOL12c8
|
||||
SNOL_406400E3_43200-0 SNOL12c9
|
||||
SNOL_609600E3_43200-0 SNOL12c10
|
||||
Vis1609.0m Visc1
|
||||
Vis4827.0m Visc2
|
||||
WS12.89m/s WSc1
|
||||
WS17.5m/s WSc2
|
||||
WS25.7m/s WSc3
|
||||
WS25.78m/s WSc4
|
||||
GH152.5gpm Cigc1
|
||||
GH305.0gpm Cigc2
|
||||
GH914.6gpm Cigc3
|
||||
T273.0K Tc1
|
||||
CAPE500.0J/kg CAPEc1
|
||||
CAPE1000.0J/kg CAPEc2
|
||||
CAPE2000.0J/kg CAPEc3
|
||||
CAPE3000.0J/kg CAPEc4
|
||||
CAPE4000.0J/kg CAPEc5
|
||||
CFRZR1.0 CFRZRc1
|
||||
CICEP1.0 CICEPc1
|
||||
CRAIN1.0 CRAINc1
|
||||
CSNOW1.0 CSNOWc1
|
||||
PLI0.0K PLIxc1
|
||||
PLI-2.0K PLIxc2
|
||||
PLI-4.0K PLIxc3
|
||||
PLI-6.0K PLIxc4
|
||||
PLI-8.0K PLIxc5
|
||||
TP0.25mm_10800-0 tp3c1
|
||||
TP1.27mm_10800-0 tp3c2
|
||||
TP2.54mm_10800-0 tp3c3
|
||||
TP6.35mm_10800-0 tp3c4
|
||||
TP12.7mm_10800-0 tp3c5
|
||||
TP25.4mm_10800-0 tp3c6
|
||||
TP38.1mm_10800-0 tp3c7
|
||||
TP50.8mm_10800-0 tp3c8
|
||||
TP0.25mm_21600-0 tp6c1
|
||||
TP1.27mm_21600-0 tp6c2
|
||||
TP2.54mm_21600-0 tp6c3
|
||||
TP6.35mm_21600-0 tp6c4
|
||||
TP12.7mm_21600-0 tp6c5
|
||||
TP25.4mm_21600-0 tp6c6
|
||||
TP38.1mm_21600-0 tp6c7
|
||||
TP50.8mm_21600-0 tp6c8
|
||||
TP0.25mm_43200-0 tp12c1
|
||||
TP1.27mm_43200-0 tp12c2
|
||||
TP2.54mm_43200-0 tp12c3
|
||||
TP6.35mm_43200-0 tp12c4
|
||||
TP12.7mm_43200-0 tp12c5
|
||||
TP25.4mm_43200-0 tp12c6
|
||||
TP38.1mm_43200-0 tp12c7
|
||||
TP50.8mm_43200-0 tp12c8
|
||||
TP0.25mm_86400-0 tp24c1
|
||||
TP1.27mm_86400-0 tp24c2
|
||||
TP2.54mm_86400-0 tp24c3
|
||||
TP6.35mm_86400-0 tp24c4
|
||||
TP12.7mm_86400-0 tp24c5
|
||||
TP25.4mm_86400-0 tp24c6
|
||||
TP38.1mm_86400-0 tp24c7
|
||||
TP50.8mm_86400-0 tp24c8
|
||||
SNOL25.4mm_43200-0 SNOL12c1
|
||||
SNOL508.0mm_43200-0 SNOL12c2
|
||||
SNOL101.6mm_43200-0 SNOL12c3
|
||||
SNOL152.4mm_43200-0 SNOL12c4
|
||||
SNOL190.5mm_43200-0 SNOL12c5
|
||||
SNOL203.2mm_43200-0 SNOL12c6
|
||||
SNOL254.0mm_43200-0 SNOL12c7
|
||||
SNOL304.8mm_43200-0 SNOL12c8
|
||||
SNOL406.4mm_43200-0 SNOL12c9
|
||||
SNOL609.6mm_43200-0 SNOL12c10
|
||||
T_66E2_CPCMANU-NCEP-CPC_1073x689_604800-0 PTAM
|
||||
T_33E2_CPCMANU-NCEP-CPC_1073x689_604800-0 PTBM
|
||||
TP_66E2_CPCMANU-NCEP-CPC_1073x689_604800-0 PPAM
|
||||
|
|
|
|||
|
|
@ -131,3 +131,10 @@ SREF243::SNOL12c2::Prob 12-hr SNOW > 2 in
|
|||
SREF243::SNOL12c5::Prob 12-hr SNOW > 7.5 in
|
||||
SREF243::SNOL12c4::Prob 12-hr SNOW > 6 in
|
||||
SREF243::SNOL12c1::Prob 12-hr SNOW > 1 in
|
||||
|
||||
TPCWindProb::Prob34::Probability of Wind Speed > 34 knots
|
||||
TPCWindProb::Prob50::Probability of Wind Speed > 50 knots
|
||||
TPCWindProb::Prob64::Probability of Wind Speed > 64 knots
|
||||
TPCWindProb::PWS34::Incremental Prob WS 34 kts or greater
|
||||
TPCWindProb::PWS50::Incremental Prob WS 50 kts or greater
|
||||
TPCWindProb::PWS64::Incremental Prob WS 64 kts or greater
|
||||
|
|
@ -111,9 +111,6 @@ diam | || | Feature Diameter
|
|||
g2gsh | || | Gate to Gate Shear
|
||||
wDiv | || | Divergence
|
||||
ICEG | iceg || | Ice growth rate
|
||||
Prob34 | prob34 || | Probability of Wind Speed > 34 knots
|
||||
Prob50 | prob50 || | Probability of Wind Speed > 50 knots
|
||||
Prob64 | prob64 || | Probability of Wind Speed > 64 knots
|
||||
POP12hr | pop12hr || | Probability of 12hr precip
|
||||
POP6hr | pop6hr || | Probability of 6hr precip
|
||||
POP3hr | pop3hr || | Probability of 3hr precip
|
||||
|
|
@ -265,9 +262,6 @@ TP_ECMWF |tp_ecmwf || | ECMWF Total Precipitation
|
|||
TP_ECMWF12hr | || | ECMWF 12-hr Total Precipitation
|
||||
TP120hr |tp120hr || | 120-hr Total Precipitation
|
||||
PPFFG | ppffg || | Probability of excessive rain
|
||||
PWS34 | pws34 || | Incremental Prob WS 34 kts or greater
|
||||
PWS50 | pws50 || | Incremental Prob WS 50 kts or greater
|
||||
PWS64 | pws64 || | Incremental Prob WS 64 kts or greater
|
||||
SHerranl | sherranl || | RTMA Alaska specific humidity error analysis
|
||||
Perranl | perranl || | RTMA Alaska pressure error analysis
|
||||
TiltAng | || | Tilt angle of a radar PPI
|
||||
|
|
|
|||
|
|
@ -32,8 +32,4 @@
|
|||
30:30:Frictional velocity:m/s:FRICV
|
||||
# 31-191 Reserved
|
||||
# 192-254 Reserved for local use
|
||||
# AWIPS override of the PWS parameters
|
||||
198:198:Incremental Prob WS 34 kts or greater:%:PWS34
|
||||
199:199:Incremental Prob WS 50 kts or greater:%:PWS50
|
||||
200:200:Incremental Prob WS 50 kts or greater:%:PWS64
|
||||
255:255:Missing
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@
|
|||
195:195:V-Component Storm Motion:m/s:VSTM
|
||||
196:196:Drag Coefficient::CD
|
||||
197:197:Frictional Velocity:m/s:FRICV
|
||||
198:198:Incremental Prob WS 34 kts or greater:%:PWS34
|
||||
199:199:Incremental Prob WS 50 kts or greater:%:PWS50
|
||||
200:200:Incremental Prob WS 64 kts or greater:%:PWS64
|
||||
198:198:Wind speed:m/s:PWS
|
||||
199:199:Wind speed:m/s:PWS
|
||||
200:200:Wind speed:m/s:PWS
|
||||
201:201:Longitude of V Wind Component of Velocity:degrees:LOVV
|
||||
202:202:Latitude of Presure Point:degrees:LAPP
|
||||
203:203:Longitude of Presure Point:degrees:LOPP
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Product Discipline 10: Oceanographic products, Parameter Category 3: Surface Properties
|
||||
#192-254 Reserved for local use
|
||||
192:192:Surge 10% Exceedance Ht:m:Surge
|
||||
192:192:Surge Height:m:Surge
|
||||
193:193:Extra Tropical Storm Surge:m:ETSRG
|
||||
194:194:Ocean Surface Elevation Relative to Geoid:m:ELEV
|
||||
195:195:Sea Surface Height Relative to Geoid:m:SSHG
|
||||
|
|
@ -11,13 +11,13 @@
|
|||
200:200:Surface Salinity Trend:psu per day:SSST
|
||||
201:201:Kinetic Energy:J/kg:KENG
|
||||
202:202:Salt Flux:mm*s:SLTFL
|
||||
242:242:Surge 20% Exceedance Ht:m:Surge
|
||||
243:243:Surge 30% Exceedance Ht:m:Surge
|
||||
244:244:Surge 40% Exceedance Ht:m:Surge
|
||||
245:245:Surge 50% Exceedance Ht:m:Surge
|
||||
246:246:Surge 60% Exceedance Ht:m:Surge
|
||||
247:247:Surge 70% Exceedance Ht:m:Surge
|
||||
248:248:Surge 80% Exceedance Ht:m:Surge
|
||||
249:249:Surge 90% Exceedance Ht:m:Surge
|
||||
242:242:Surge Height:m:Surge
|
||||
243:243:Surge Height:m:Surge
|
||||
244:244:Surge Height:m:Surge
|
||||
245:245:Surge Height:m:Surge
|
||||
246:246:Surge Height:m:Surge
|
||||
247:247:Surge Height:m:Surge
|
||||
248:248:Surge Height:m:Surge
|
||||
249:249:Surge Height:m:Surge
|
||||
250:250:Extra Tropical Storm Surge Combined Surge and Tide:m:ETCWL
|
||||
255:255:Missing
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue