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

Merge branch 'tcv_14.4.2' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.2

Browse source 
Former-commit-id: e3067a9b0334d325f13a076d52b55f4743903671
This commit is contained in:
Fay.Liang 2015-07-24 14:07:57 -04:00
commit a7817bd79f
2 changed files with 28 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/textproducts/templates/product/HLS.py
View file

@ -1,4 +1,4 @@
# Version 2015.6.16-0
# Version 2015.7.22-0
import GenericHazards
import string, time, os, re, types, copy, LogStream, collections
@ -23,7 +23,7 @@ class TextProduct(HLSTCV_Common.TextProduct):
Definition["database"] = "Official" # Source database
Definition["debug"] = 1
Definition["mapNameForCombinations"] = "Zones_<site>"
Definition["defaultEditAreas"] = ""
Definition["defaultEditAreas"] = []
Definition["showZoneCombiner"] = 0 # 1 to cause zone combiner to display
Definition["productName"] = "LOCAL STATEMENT"
@ -1137,6 +1137,8 @@ class TextProduct(HLSTCV_Common.TextProduct):
statDict = statList[period]
for threatName in ['WindThreat', 'FloodingRainThreat', 'TornadoThreat']:
self._sampleRankedDiscreteValue(threatName, statDict)
# TODO: Investigate if this sampling method is still really needed. The JSON files may
# have all the needed information now
self._sampleMostSignificantDiscreteValue(threatName, statDict)
qpfToFfgRatio = self._getStatValue(statDict, "QPFtoFFGRatio", "Max")
@ -1183,7 +1185,6 @@ class TextProduct(HLSTCV_Common.TextProduct):
for period in range(len(statList)):
statDict = statList[period]
self._sampleRankedDiscreteValue('StormSurgeThreat', statDict)
self._sampleMostSignificantDiscreteValue('StormSurgeThreat', statDict)
inundationMax = self._getStatValue(statDict, "InundationMax", "Max")
decidingField = self._samplingDict['StormSurgeThreat']['decidingField']

33
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/textproducts/templates/product/Hazard_TCV.py
View file

@ -1,4 +1,4 @@
# Version 2015.5.22-0
# Version 2015.7.23-0
import GenericHazards
import JsonSupport
@ -433,7 +433,6 @@ class TextProduct(HLSTCV_Common.TextProduct):
analysisList = [
("InundationMax", self.moderatedMax, [6]),
("InundationTiming", self.moderatedMax, [6]),
("StormSurgeThreat", self.mostSignificantDiscreteValue),
]
return analysisList
@ -1774,16 +1773,36 @@ class StormSurgeSection(SectionCommon):
summary + " storm surge possible")
def _peakSurge(self, segmentDict, productSegmentGroup, productSegment):
self._textProduct.debug_print("_peakSurge _inundationMax = %s" % (self._stats._inundationMax), 1)
if self._stats._inundationMax is not None and self._stats._inundationMax >= 1:
max = self._stats._inundationMax
max = round(self._stats._inundationMax)
self._stats._maxThreat = "None"
if max > 10:
maxRange = 4
self._stats._maxThreat = "Extreme"
elif max > 6:
maxRange = 3
elif max > 2:
if max >= 10:
self._stats._maxThreat = "Extreme"
else:
self._stats._maxThreat = "High"
elif max >= 3:
maxRange = 2
if max >= 4:
self._stats._maxThreat = "Mod"
else:
self._stats._maxThreat = "Elevated"
else:
maxRange = None
if max > 0:
self._stats._maxThreat = "Elevated"
self._textProduct.debug_print("_peakSurge maxRange = %s" % (maxRange), 1)
self._textProduct.debug_print("_peakSurge _maxThreat = %s" % (self._stats._maxThreat), 1)
# Save off the surge threat to the advisory
self._textProduct._currentAdvisory['ZoneData'][self._segment]["StormSurgeThreat"] = self._stats._maxThreat
if maxRange is not None:
words = str(int(max - maxRange)) + "-" + str(int(max)) + " feet above ground"
@ -2681,7 +2700,6 @@ class StormSurgeSectionStats(SectionCommonStats):
if phishEndTime is None:
phishEndTime = tr.startTime()
self._updateThreatStats(tr, statDict, "StormSurgeThreat")
self._windowSurge = "Window of concern: "
@ -2720,7 +2738,6 @@ class StormSurgeSectionStats(SectionCommonStats):
else:
self._windowSurge += "through " + endTimeDescriptor
self._currentAdvisory["StormSurgeThreat"] = self._maxThreat
if self._inundationMax is not None:
# Round so we don't store values like 1.600000023841858
self._currentAdvisory["StormSurgeForecast"] = \
@ -2752,10 +2769,6 @@ class StormSurgeSectionStats(SectionCommonStats):
if self._inundationMax >= 1 and self._onsetSurgeHour is None:
missingGridsList.append("InundationTiming")
# Threat grid
if self._maxThreat is None:
missingGridsList.append("StormSurgeThreat")
# If there are any missing grids - let the user know
if len(missingGridsList) > 0:
msg = "\n\nSome grids are missing! Please check these grids " + \