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

Merged
jcapriot merged 3 commits into from
Dec 2, 2025
Merged

Fix logic error when zeros_outside was True #410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3afee98
fix logic error when zeros_outside was True
jcapriot Nov 18, 2025
503af5e
refactor interpolation tests
jcapriot Dec 2, 2025
0253e0a
remove unused argument in test
jcapriot Dec 2, 2025
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
104 changes: 11 additions & 93 deletions tests/tree/test_tree.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,99 +438,6 @@ def test_cell_bounds(self, mesh):
np.testing.assert_equal(cell_bounds, cell_bounds_slow)


class Test2DInterpolation(unittest.TestCase):
def setUp(self):
def topo(x):
return np.sin(x * (2.0 * np.pi)) * 0.3 + 0.5

def function(cell):
r = cell.center - np.array([0.5] * len(cell.center))
dist1 = np.sqrt(r.dot(r)) - 0.08
dist2 = np.abs(cell.center[-1] - topo(cell.center[0]))

dist = min([dist1, dist2])
# if dist < 0.05:
# return 5
if dist < 0.05:
return 6
if dist < 0.2:
return 5
if dist < 0.3:
return 4
if dist < 1.0:
return 3
else:
return 0

M = discretize.TreeMesh([64, 64], levels=6)
M.refine(function)
self.M = M

def test_fx(self):
r = rng.random(self.M.nFx)
P = self.M.get_interpolation_matrix(self.M.gridFx, "Fx")
self.assertLess(np.abs(P[:, : self.M.nFx] * r - r).max(), TOL)

def test_fy(self):
r = rng.random(self.M.nFy)
P = self.M.get_interpolation_matrix(self.M.gridFy, "Fy")
self.assertLess(np.abs(P[:, self.M.nFx :] * r - r).max(), TOL)


class Test3DInterpolation(unittest.TestCase):
def setUp(self):
def function(cell):
r = cell.center - np.array([0.5] * len(cell.center))
dist = np.sqrt(r.dot(r))
if dist < 0.2:
return 4
if dist < 0.3:
return 3
if dist < 1.0:
return 2
else:
return 0

M = discretize.TreeMesh([16, 16, 16], levels=4)
M.refine(function)
# M.plot_grid(show_it=True)
self.M = M

def test_Fx(self):
r = rng.random(self.M.nFx)
P = self.M.get_interpolation_matrix(self.M.gridFx, "Fx")
self.assertLess(np.abs(P[:, : self.M.nFx] * r - r).max(), TOL)

def test_Fy(self):
r = rng.random(self.M.nFy)
P = self.M.get_interpolation_matrix(self.M.gridFy, "Fy")
self.assertLess(
np.abs(P[:, self.M.nFx : (self.M.nFx + self.M.nFy)] * r - r).max(), TOL
)

def test_Fz(self):
r = rng.random(self.M.nFz)
P = self.M.get_interpolation_matrix(self.M.gridFz, "Fz")
self.assertLess(np.abs(P[:, (self.M.nFx + self.M.nFy) :] * r - r).max(), TOL)

def test_Ex(self):
r = rng.random(self.M.nEx)
P = self.M.get_interpolation_matrix(self.M.gridEx, "Ex")
self.assertLess(np.abs(P[:, : self.M.nEx] * r - r).max(), TOL)

def test_Ey(self):
r = rng.random(self.M.nEy)
P = self.M.get_interpolation_matrix(self.M.gridEy, "Ey")
self.assertLess(
np.abs(P[:, self.M.nEx : (self.M.nEx + self.M.nEy)] * r - r).max(), TOL
)

def test_Ez(self):
r = rng.random(self.M.nEz)
P = self.M.get_interpolation_matrix(self.M.gridEz, "Ez")
self.assertLess(np.abs(P[:, (self.M.nEx + self.M.nEy) :] * r - r).max(), TOL)


class TestWrapAroundLevels(unittest.TestCase):
def test_refine_func(self):
mesh1 = discretize.TreeMesh((16, 16, 16))
Expand Down Expand Up @@ -649,5 +556,16 @@ def test_repr_html(self, mesh, finalize):
assert len(output) != 0


@pytest.mark.parametrize("attr", ["average_edge_to_face"])
def test_caching(attr):
mesh = discretize.TreeMesh([4, 4, 4])
mesh.refine(-1)

attr1 = getattr(mesh, attr)
attr2 = getattr(mesh, attr)

assert attr1 is attr2


if __name__ == "__main__":
unittest.main()
Loading
Loading