Merge branch 'asm_14.2.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.2

Former-commit-id: 7a7e030bd70bb5bfee849750f1a8e1e4238ec0ee
This commit is contained in:
Brian.Dyke 2014-08-18 10:20:49 -04:00
commit 0bdacc25f6

View file

@ -49,7 +49,7 @@ from com.raytheon.uf.common.dataplugin.level import LevelFactory
from com.raytheon.edex.plugin.grib.spatial import GribSpatialCache
from com.raytheon.edex.util.grib import GribTableLookup
from com.raytheon.edex.util import Util
from com.raytheon.uf.common.util import GridUtil
from com.raytheon.edex.util.grib import GribParamTranslator
@ -123,6 +123,8 @@ logHandler = UFStatusHandler.UFStatusHandler("com.raytheon.edex.plugin.grib", "E
# grib files.
# Feb 11, 2014 2765 bsteffen Better handling of probability parameters.
# Apr 28, 2014 3084 bsteffen Use full grid for looking up parameter aliases.
# Aug 15, 2014 15699 MPorricelli Import GridUtil and update reference
# to GRID_FILL_VALUE
#
class GribDecoder():
@ -333,7 +335,7 @@ class GribDecoder():
subGridDataArray = numpy.zeros((subny, subnx), numpy.float32)
midx = nx - startx
subGridDataArray[0:subny, 0:midx] = numpyDataArray[starty:endY, startx:nx]
subGridDataArray[0:subny, midx:subnx] = Util.GRID_FILL_VALUE
subGridDataArray[0:subny, midx:subnx] = GridUtil.GRID_FILL_VALUE
numpyDataArray = subGridDataArray
else:
numpyDataArray = numpyDataArray[starty:endY, startx:endX]