Merge "Issue #1459 fix interp function when data is shared amongst multiple parameters." into development

Former-commit-id: d9650b113c [formerly d9650b113c [formerly 217b8d82c7b558a8c78126c3ba37f915a8c9e693]]
Former-commit-id: 4c5a92876f
Former-commit-id: 64f6a70c37
This commit is contained in:
Steve Harris 2013-01-08 10:46:29 -06:00 committed by Gerrit Code Review
commit 02e2a634cf

View file

@ -18,7 +18,7 @@
# further licensing information.
##
from scipy.interpolate import Rbf
from numpy import zeros, float32, NaN, isnan
from numpy import zeros, float32, NaN, isnan, array
##
# Designed to replace interp_up and interp_down in design files for point data
@ -31,6 +31,9 @@ def execute(paramArray, vertArray, numLevels, vertPoints, maxGap=None):
if type(verts) == float32:
verts = [verts]
params = paramArray[i]
# clone verts and params before modifying
verts = array(verts)
params = array(params)
gi = 0
for ci in range(len(verts)):
if isnan(verts[ci]) or isnan(params[ci]):