Merge branch 'main' into tree-mesh-cell-bounds

Author: jcapriot

discretize/tensor_mesh.py

@@ -593,6 +593,26 @@ def face_boundary_indices(self):
             indzu = self.gridFz[:, 2] == max(self.gridFz[:, 2])
             return indxd, indxu, indyd, indyu, indzd, indzu
 
+    @property
+    def cell_bounds(self):
+        """The bounds of each cell.
+
+        Return a 2D array with the coordinates that define the bounds of each
+        cell in the mesh. Each row of the array contains the bounds for
+        a particular cell in the following order: ``x1``, ``x2``, ``y1``,
+        ``y2``, ``z1``, ``z2``, where ``x1 < x2``, ``y1 < y2`` and ``z1 < z2``.
+        """
+        nodes = self.nodes.reshape((*self.shape_nodes, -1), order="F")
+
+        min_nodes = nodes[(slice(-1),) * self.dim]
+        min_nodes = min_nodes.reshape((self.n_cells, -1), order="F")
+        max_nodes = nodes[(slice(1, None),) * self.dim]
+        max_nodes = max_nodes.reshape((self.n_cells, -1), order="F")
+
+        cell_bounds = np.stack((min_nodes, max_nodes), axis=-1)
+        cell_bounds = cell_bounds.reshape((self.n_cells, -1))
+        return cell_bounds
+
     @property
     def cell_nodes(self):
         """The index of all nodes for each cell.

tests/base/test_tensor.py

@@ -253,26 +253,34 @@ def test_serialization(self):
         self.assertTrue(np.all(self.mesh2.gridCC == mesh.gridCC))
 
 
-class TestTensorMeshCellNodes:
+class TestTensorMeshProperties:
     """
-    Test TensorMesh.cell_nodes
+    Test some of the properties in TensorMesh
     """
 
     @pytest.fixture(params=[1, 2, 3], ids=["dims-1", "dims-2", "dims-3"])
     def mesh(self, request):
         """Sample TensorMesh."""
         if request.param == 1:
             h = [10]
+            origin = (-35.5,)
         elif request.param == 2:
             h = [10, 15]
+            origin = (-35.5, 105.3)
         else:
             h = [10, 15, 20]
-        return discretize.TensorMesh(h)
+            origin = (-35.5, 105.3, -27.3)
+        return discretize.TensorMesh(h, origin=origin)
 
     def test_cell_nodes(self, mesh):
         """Test TensorMesh.cell_nodes."""
         expected_cell_nodes = np.array([cell.nodes for cell in mesh])
-        np.testing.assert_allclose(mesh.cell_nodes, expected_cell_nodes)
+        np.testing.assert_equal(mesh.cell_nodes, expected_cell_nodes)
+
+    def test_cell_bounds(self, mesh):
+        """Test TensorMesh.cell_bounds."""
+        expected_cell_bounds = np.array([cell.bounds for cell in mesh])
+        np.testing.assert_equal(mesh.cell_bounds, expected_cell_bounds)
 
 
 class TestPoissonEqn(discretize.tests.OrderTest):