Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix division by zero in 1d interpolation #1040

Merged
merged 1 commit into from
Nov 25, 2024
Merged

Fix division by zero in 1d interpolation #1040

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions mpas_analysis/shared/interpolation/interp_1d.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,14 +135,24 @@ def _compute_weights_and_indices(ds, inInterpDim, inInterpCoord, outInterpDim,
ind1[inAxis] = inIndex + 1
ind1 = tuple(ind1)
x1 = numpy.array(xIn[ind1])
dx = x1 - x0
frac = (x - x0) / dx
valid = numpy.isfinite(frac)
mask = numpy.zeros(valid.shape, bool)

# broadcast the arrays in needed
x_bc, x0_bc = numpy.broadcast_arrays(x, x0)
_, x1_bc = numpy.broadcast_arrays(x, x1)

# avoid division by zero
denom = x1_bc - x0_bc
num = x_bc - x0_bc
valid = denom != 0.
frac = numpy.zeros(num.shape)
frac[valid] = num[valid] / denom[valid]

mask = numpy.zeros(num.shape, bool)
mask[valid] = numpy.logical_and(frac[valid] >= 0.,
frac[valid] < 1.)

if inIndex == inInterpSize - 2:
mask = numpy.logical_or(mask, x == x1)
mask = numpy.logical_or(mask, x_bc == x1_bc)
if numpy.count_nonzero(mask) == 0:
continue

Expand Down
Loading