Skip to content

Fix logic error when zeros_outside was True #410

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix logic error when zeros_outside was True #410

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
27 changes: 24 additions & 3 deletions discretize/_extensions/tree_ext.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5813,26 +5813,33 @@ cdef class _TreeMesh:
cell = self.tree.containing_cell(x, y, z)
row_inds = indices[indptr[i]:indptr[i+1]]
row_data = data[indptr[i]:indptr[i+1]]
was_outside = False
if zeros_out:
if x < cell.points[0].location[0]-eps:
row_data[:] = 0.0
row_inds[:] = 0
was_outside = True
elif x > cell.points[3].location[0]+eps:
row_data[:] = 0.0
row_inds[:] = 0
was_outside = True
elif y < cell.points[0].location[1]-eps:
row_data[:] = 0.0
row_inds[:] = 0
was_outside = True
elif y > cell.points[3].location[1]+eps:
row_data[:] = 0.0
row_inds[:] = 0
was_outside = True
elif dim == 3 and z < cell.points[0].location[2]-eps:
row_data[:] = 0.0
row_inds[:] = 0
was_outside = True
elif dim == 3 and z > cell.points[7].location[2]+eps:
row_data[:] = 0.0
row_inds[:] = 0
else:
was_outside = True
if not was_outside:
# look + dir and - dir away
if (
locations[i, dir] < cell.location[dir]
Expand Down Expand Up @@ -5964,26 +5971,33 @@ cdef class _TreeMesh:
cell = self.tree.containing_cell(x, y, z)
row_inds = indices[indptr[i]:indptr[i+1]]
row_data = data[indptr[i]:indptr[i+1]]
was_outside = False
if zeros_out:
if x < cell.points[0].location[0]-eps:
row_data[:] = 0.0
row_inds[:] = 0
was_outside = True
elif x > cell.points[3].location[0]+eps:
row_data[:] = 0.0
row_inds[:] = 0
was_outside = True
elif y < cell.points[0].location[1]-eps:
row_data[:] = 0.0
row_inds[:] = 0
was_outside = True
elif y > cell.points[3].location[1]+eps:
row_data[:] = 0.0
row_inds[:] = 0
was_outside = True
elif dim == 3 and z < cell.points[0].location[2]-eps:
row_data[:] = 0.0
row_inds[:] = 0
was_outside = True
elif dim == 3 and z > cell.points[7].location[2]+eps:
row_data[:] = 0.0
row_inds[:] = 0
else:
was_outside = True
if not was_outside:
# Find containing cells
# Decide order to search based on which face it is closest to
if dim == 3:
Expand Down Expand Up @@ -6219,26 +6233,33 @@ cdef class _TreeMesh:
cell = self.tree.containing_cell(x, y, z)
row_inds = indices[indptr[i]:indptr[i + 1]]
row_data = data[indptr[i]:indptr[i + 1]]
was_outside = False
if zeros_out:
if x < cell.points[0].location[0]-eps:
row_data[:] = 0.0
row_inds[:] = 0
was_outside = True
elif x > cell.points[3].location[0]+eps:
row_data[:] = 0.0
row_inds[:] = 0
was_outside = True
elif y < cell.points[0].location[1]-eps:
row_data[:] = 0.0
row_inds[:] = 0
was_outside = True
elif y > cell.points[3].location[1]+eps:
row_data[:] = 0.0
row_inds[:] = 0
was_outside = True
elif dim == 3 and z < cell.points[0].location[2]-eps:
row_data[:] = 0.0
row_inds[:] = 0
was_outside = True
elif dim == 3 and z > cell.points[7].location[2]+eps:
row_data[:] = 0.0
row_inds[:] = 0
else:
was_outside = True
if not was_outside:
# decide order to search based on distance to each faces
#
if (
Expand Down