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

Revert "ASM #15630 -- GFE: Missing ISC Wind Grids"

Browse source 
This reverts commit a31a408a18846806e64c2450d665b6ce6ed8ea82 [formerly 8de6be5219] [formerly 212fcd9eb4 [formerly a5791db7cb] [formerly 212fcd9eb4 [formerly a5791db7cb] [formerly 8de6be5219 [formerly db678db964b46a46e062cd0602cf9ce8bc96e4cd]]]].

Change-Id: Ib5d03f81b35c0371e063a89739b823b8264c439f

Former-commit-id: faf934a05a [formerly 425bcea65d] [formerly faf934a05a [formerly 425bcea65d] [formerly 65802e34fd [formerly 7dcfb55353ba7ec9d0619737da37781b0b186e5d]]]
Former-commit-id: 65802e34fd
Former-commit-id: e44a911ccc [formerly e53566cda2]
Former-commit-id: 44cfa3d6d3
This commit is contained in:
Shawn Hooper 2014-07-22 10:15:46 -05:00 • committed by Gerrit Code Review
parent 5a51ceabac
commit 17d864604d
1 changed files with 11 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
View file

@ -38,7 +38,6 @@ from com.raytheon.uf.common.time import TimeRange
from com.vividsolutions.jts.geom import Coordinate from com.vividsolutions.jts.geom import Coordinate
from java.awt import Point from java.awt import Point
from com.raytheon.edex.plugin.gfe.server import GridParmManager
from com.raytheon.edex.plugin.gfe.config import IFPServerConfigManager from com.raytheon.edex.plugin.gfe.config import IFPServerConfigManager
from com.raytheon.edex.plugin.gfe.smartinit import IFPDB from com.raytheon.edex.plugin.gfe.smartinit import IFPDB
from com.raytheon.uf.common.dataplugin.gfe import GridDataHistory from com.raytheon.uf.common.dataplugin.gfe import GridDataHistory
@ -62,7 +61,6 @@ from com.raytheon.uf.common.dataplugin.gfe.reference import ReferenceID
from com.raytheon.uf.common.dataplugin.gfe.reference import ReferenceData_CoordinateType as CoordinateType from com.raytheon.uf.common.dataplugin.gfe.reference import ReferenceData_CoordinateType as CoordinateType
from com.raytheon.uf.edex.database.cluster import ClusterLockUtils from com.raytheon.uf.edex.database.cluster import ClusterLockUtils
from com.raytheon.uf.edex.database.cluster import ClusterTask from com.raytheon.uf.edex.database.cluster import ClusterTask
from java.lang import System
# #
# Port of iscMosaic.py # Port of iscMosaic.py
@ -82,10 +80,13 @@ from java.lang import System
# 05/23/13 1759 dgilling Remove unnecessary imports. # 05/23/13 1759 dgilling Remove unnecessary imports.
# 06/05/13 2063 dgilling Change __siteInDbGrid() to # 06/05/13 2063 dgilling Change __siteInDbGrid() to
# call IFPWE.history() like A1. # call IFPWE.history() like A1.
# 09/05/13 2307 dgilling Fix breakage caused by #2044.
# 10/31/2013 2508 randerso Change to use DiscreteGridSlice.getKeys()
# 11/05/13 2517 randerso Restructured logging so it coulde be used by WECache # 11/05/13 2517 randerso Restructured logging so it coulde be used by WECache
# Changed WECache to limit the number of cached grids kept in memory # Changed WECache to limit the number of cached grids kept in memory
# 01/09/14 16952 randerso Fix regression made in #2517 which caused errors with overlapping grids # 01/09/14 16952 randerso Fix regression made in #2517 which caused errors with overlapping grids
# 02/04/14 17042 ryu Check in changes for randerso. # 02/04/14 17042 ryu Check in changes for randerso.
# 04/11/2014 17242 David Gillingham (code checked in by zhao)
# #
BATCH_DELAY = 0.0 BATCH_DELAY = 0.0
@ -418,18 +419,12 @@ class WECache(object):
elif gridType == "VECTOR": elif gridType == "VECTOR":
vecGrids = grid.__numpy__ vecGrids = grid.__numpy__
return (vecGrids[0], vecGrids[1]) return (vecGrids[0], vecGrids[1])
elif gridType == "WEATHER": elif gridType == "WEATHER" or gridType =="DISCRETE":
keys = grid.getKeys() keys = grid.getKeys()
keyList = [] keyList = []
for theKey in keys: for theKey in keys:
keyList.append(theKey.toString()) keyList.append(theKey.toString())
return (grid.__numpy__[0], keyList) return (grid.__numpy__[0], keyList)
elif gridType == "DISCRETE":
keys = grid.getKey()
keyList = []
for theKey in keys:
keyList.append(theKey.toString())
return (grid.__numpy__[0], keyList)
def __encodeGridHistory(self, histories): def __encodeGridHistory(self, histories):
retVal = [] retVal = []
@ -731,9 +726,6 @@ class IscMosaic:
# process incoming grids # process incoming grids
for i in xrange(len(inTimes)): for i in xrange(len(inTimes)):
# update cluster lock time to avoid time out
ClusterLockUtils.updateLockTime("ISC Write Lock", parmName , System.currentTimeMillis())
# Put in a delay so we don't hammer the server so hard. # Put in a delay so we don't hammer the server so hard.
if self.__gridDelay > 0.0: if self.__gridDelay > 0.0:
time.sleep(self.__gridDelay) time.sleep(self.__gridDelay)
@ -755,7 +747,7 @@ class IscMosaic:
grid = self.__validateAdjustWeatherKeys(grid, grid = self.__validateAdjustWeatherKeys(grid,
self.__parmName, tr) self.__parmName, tr)
grid = self.__remap(self.__dbwe.getParmid(), grid, inGeoDict, inFillV) grid = self.__remap(self.__dbwe, grid, inGeoDict, inFillV)
# if rate parm, then may need to adjust the values # if rate parm, then may need to adjust the values
if self.__rateParm and inTimes[i] != tr: if self.__rateParm and inTimes[i] != tr:
@ -1232,13 +1224,12 @@ class IscMosaic:
return grid.astype(numpy.float32) return grid.astype(numpy.float32)
def __remap(self, pid, grid, inGeoDict, inFillV): def __remap(self, we, grid, inGeoDict, inFillV):
gpi = we.getGpi()
gpi = GridParmManager.getGridParmInfo(pid).getPayload()
gridType = gpi.getGridType().toString() gridType = gpi.getGridType().toString()
gs = self.__decodeGridSlice(pid, grid, TimeRange()) gs = self.__decodeGridSlice(we, grid, TimeRange())
pd = self.__decodeProj(inGeoDict) pd = self.__decodeProj(inGeoDict)
fill = inFillV fill = inFillV
@ -1268,9 +1259,10 @@ class IscMosaic:
newGrid = mapper.remap(gs.getDiscreteGrid(), fill, fill) newGrid = mapper.remap(gs.getDiscreteGrid(), fill, fill)
return (newGrid.__numpy__[0], grid[1]) return (newGrid.__numpy__[0], grid[1])
def __decodeGridSlice(self, pid, value, tr, history=None): def __decodeGridSlice(self, we, value, tr, history=None):
pid = we.getParmid()
gpi = we.getGpi()
gpi = GridParmManager.getGridParmInfo(pid).getPayload()
gridType = gpi.getGridType().toString() gridType = gpi.getGridType().toString()
hist = ArrayList() hist = ArrayList()