Issue #3080 add NaN conversion to Slice.py

Former-commit-id: 96ebfc4ae9 [formerly eb9a0398df] [formerly 156c25fb9c] [formerly 5959b17732 [formerly 156c25fb9c [formerly 084a209f64cf9deb527414500c368ea397b9e3a4]]]
Former-commit-id: 5959b17732
Former-commit-id: b1afe65ee8b094ce8f0e0dd9ca0140878d1a13d8 [formerly ca8cd9fb43]
Former-commit-id: 8a1b16d15e
This commit is contained in:
Ben Steffensmeier 2014-04-29 15:35:29 -05:00
parent a447baa5a0
commit 08442c513a

View file

@ -19,7 +19,9 @@
##
import gridslice
from numpy import ndarray
from numpy import ndarray, NaN
gridslice_maskval = 1e37
def execute(*args):
#defineNumpySlice(vc, param, targetLevel, sense)
@ -39,16 +41,18 @@ def execute(*args):
if type(args[1]) == ndarray:
# target level is 2d grid
rval = gridslice.createNumpySlice(args[0][1], args[0][0], args[1], int(args[2]))
rval[rval == gridslice_maskval] = NaN
return rval
else:
# target level is single value
rval = gridslice.defineNumpySlice(args[0][1], args[0][0], args[1], int(args[2]))
rval[rval == gridslice_maskval] = NaN
return rval
else:
if type(args[2]) == ndarray:
# cube, cube, grid, sense
rval = gridslice.createNumpySlice(args[0][0], args[1][0], args[2], int(args[3]))
rval[rval == gridslice_maskval] = NaN
return rval
else:
# cube, cube, level, sense
@ -62,6 +66,6 @@ def execute(*args):
rval = gridslice.defineNumpySlice(args[0][1], args[0][0], args[2], levelSense)
rval = gridslice.createNumpySlice(args[1][1], args[1][0], rval, int(args[3]))
rval[rval == gridslice_maskval] = NaN
return rval