refactor grid tests without pytest-cases

Author: wpbonelli

autotest/test_grid.py

@@ -13,7 +13,6 @@
 from matplotlib import pyplot as plt
 from modflow_devtools.markers import requires_exe, requires_pkg
 from modflow_devtools.misc import has_pkg
-from pytest_cases import parametrize_with_cases
 
 from flopy.discretization import StructuredGrid, UnstructuredGrid, VertexGrid
 from flopy.mf6 import MFSimulation
@@ -1090,7 +1089,17 @@ def test_voronoi_vertex_grid(function_tmpdir):
 @flaky
 @requires_exe("triangle")
 @requires_pkg("shapely", "scipy")
-@parametrize_with_cases("grid_info", cases=GridCases, prefix="voronoi")
+@pytest.mark.parametrize(
+    "grid_info",
+    [
+        GridCases.voronoi_polygon(),
+        GridCases.voronoi_rectangle(),
+        GridCases.voronoi_circle(),
+        GridCases.voronoi_nested_circles(),
+        GridCases.voronoi_polygons(),
+        GridCases.voronoi_many_polygons(),
+    ],
+)
 def test_voronoi_grid(request, function_tmpdir, grid_info):
     name = (
         request.node.name.replace("/", "_")
@@ -1242,8 +1251,8 @@ def test_unstructured_neighbors(unstructured_grid):
     assert np.allclose(queen_neighbors, [0, 10, 1, 6, 11, 2, 3, 7, 8, 12, 13])
 
 
-@parametrize_with_cases("grid", cases=GridCases, prefix="structured_cbd")
-def test_structured_ncb_thickness(grid):
+def test_structured_ncb_thickness():
+    grid = GridCases.structured_cbd_small()
     thickness = grid.cell_thickness
 
     assert thickness.shape[0] == grid.nlay + np.count_nonzero(
@@ -1265,29 +1274,40 @@ def test_structured_ncb_thickness(grid):
     ), "saturated_thickness is not properly indexing confining beds"
 
 
-@parametrize_with_cases("grid", cases=GridCases, prefix="unstructured")
+@pytest.mark.parametrize(
+    "grid", [GridCases.unstructured_small(), GridCases.unstructured_medium()]
+)
 def test_unstructured_iverts(grid):
     iverts = grid.iverts
     assert not any(
         None in l for l in iverts
     ), "None type should not be returned in iverts list"
 
 
-@parametrize_with_cases("grid", cases=GridCases, prefix="structured")
+@pytest.mark.parametrize(
+    "grid", [GridCases.structured_small(), GridCases.structured_cbd_small()]
+)
 def test_get_lni_structured(grid):
     for nn in range(0, grid.nnodes):
         layer, i = grid.get_lni([nn])[0]
         assert layer * grid.ncpl + i == nn
 
 
-@parametrize_with_cases("grid", cases=GridCases, prefix="vertex")
+@pytest.mark.parametrize(
+    "grid",
+    [
+        GridCases.vertex_small(),
+    ],
+)
 def test_get_lni_vertex(grid):
     for nn in range(0, grid.nnodes):
         layer, i = grid.get_lni([nn])[0]
         assert layer * grid.ncpl + i == nn
 
 
-@parametrize_with_cases("grid", cases=GridCases, prefix="unstructured")
+@pytest.mark.parametrize(
+    "grid", [GridCases.unstructured_small(), GridCases.unstructured_medium()]
+)
 def test_get_lni_unstructured(grid):
     for nn in range(0, grid.nnodes):
         layer, i = grid.get_lni([nn])[0]

autotest/test_grid_cases.py

@@ -1,3 +1,6 @@
+from pathlib import Path
+from tempfile import TemporaryDirectory
+
 import numpy as np
 
 from flopy.discretization import StructuredGrid, UnstructuredGrid, VertexGrid
@@ -6,7 +9,8 @@
 
 
 class GridCases:
-    def structured_small(self):
+    @staticmethod
+    def structured_small():
         nlay, nrow, ncol = 3, 2, 3
         delc = 1.0 * np.ones(nrow, dtype=float)
         delr = 1.0 * np.ones(ncol, dtype=float)
@@ -27,7 +31,8 @@ def structured_small(self):
             idomain=idomain,
         )
 
-    def structured_cbd_small(self):
+    @staticmethod
+    def structured_cbd_small():
         nlay = 3
         nrow = ncol = 15
         laycbd = np.array([1, 2, 0], dtype=int)
@@ -61,7 +66,8 @@ def structured_cbd_small(self):
             laycbd=laycbd,
         )
 
-    def vertex_small(self):
+    @staticmethod
+    def vertex_small():
         nlay, ncpl = 3, 5
         vertices = [
             [0, 0.0, 3.0],
@@ -99,7 +105,8 @@ def vertex_small(self):
             idomain=idomain,
         )
 
-    def unstructured_small(self):
+    @staticmethod
+    def unstructured_small():
         nlay = 3
         ncpl = [5, 5, 5]
         vertices = [
@@ -167,7 +174,8 @@ def unstructured_small(self):
             idomain=idomain.flatten(),
         )
 
-    def unstructured_medium(self):
+    @staticmethod
+    def unstructured_medium():
         iverts = [
             [4, 3, 2, 1, 0, None],
             [7, 0, 1, 6, 5, None],
@@ -211,7 +219,8 @@ def unstructured_medium(self):
 
         return UnstructuredGrid(verts, iverts, ncpl=[len(iverts)])
 
-    def voronoi_polygon(self, function_tmpdir):
+    @staticmethod
+    def voronoi_polygon():
         ncpl = 3803
         domain = [
             [1831.381546, 6335.543757],
@@ -237,18 +246,20 @@ def voronoi_polygon(self, function_tmpdir):
         max_area = 100.0**2
         angle = 30
 
-        tri = Triangle(
-            maximum_area=max_area, angle=angle, model_ws=str(function_tmpdir)
-        )
-        tri.add_polygon(poly)
-        tri.build(verbose=False)
-        vor = VoronoiGrid(tri)
-        gridprops = vor.get_gridprops_vertexgrid()
-        grid = VertexGrid(**gridprops, nlay=1)
+        with TemporaryDirectory() as tempdir:
+            tri = Triangle(
+                maximum_area=max_area, angle=angle, model_ws=str(Path(tempdir))
+            )
+            tri.add_polygon(poly)
+            tri.build(verbose=False)
+            vor = VoronoiGrid(tri)
+            gridprops = vor.get_gridprops_vertexgrid()
+            grid = VertexGrid(**gridprops, nlay=1)
 
         return ncpl, vor, gridprops, grid
 
-    def voronoi_rectangle(self, function_tmpdir):
+    @staticmethod
+    def voronoi_rectangle():
         ncpl = 1679
         xmin = 0.0
         xmax = 2.0
@@ -260,18 +271,20 @@ def voronoi_rectangle(self, function_tmpdir):
         max_area = 0.001
         angle = 30
 
-        tri = Triangle(
-            maximum_area=max_area, angle=angle, model_ws=str(function_tmpdir)
-        )
-        tri.add_polygon(poly)
-        tri.build(verbose=False)
-        vor = VoronoiGrid(tri)
-        gridprops = vor.get_gridprops_vertexgrid()
-        grid = VertexGrid(**gridprops, nlay=1)
+        with TemporaryDirectory() as tempdir:
+            tri = Triangle(
+                maximum_area=max_area, angle=angle, model_ws=str(Path(tempdir))
+            )
+            tri.add_polygon(poly)
+            tri.build(verbose=False)
+            vor = VoronoiGrid(tri)
+            gridprops = vor.get_gridprops_vertexgrid()
+            grid = VertexGrid(**gridprops, nlay=1)
 
         return ncpl, vor, gridprops, grid
 
-    def voronoi_circle(self, function_tmpdir):
+    @staticmethod
+    def voronoi_circle():
         ncpl = 538
         theta = np.arange(0.0, 2 * np.pi, 0.2)
         radius = 100.0
@@ -281,18 +294,20 @@ def voronoi_circle(self, function_tmpdir):
         max_area = 50
         angle = 30
 
-        tri = Triangle(
-            maximum_area=max_area, angle=angle, model_ws=str(function_tmpdir)
-        )
-        tri.add_polygon(poly)
-        tri.build(verbose=False)
-        vor = VoronoiGrid(tri)
-        gridprops = vor.get_gridprops_vertexgrid()
-        grid = VertexGrid(**gridprops, nlay=1)
+        with TemporaryDirectory() as tempdir:
+            tri = Triangle(
+                maximum_area=max_area, angle=angle, model_ws=str(Path(tempdir))
+            )
+            tri.add_polygon(poly)
+            tri.build(verbose=False)
+            vor = VoronoiGrid(tri)
+            gridprops = vor.get_gridprops_vertexgrid()
+            grid = VertexGrid(**gridprops, nlay=1)
 
         return ncpl, vor, gridprops, grid
 
-    def voronoi_nested_circles(self, function_tmpdir):
+    @staticmethod
+    def voronoi_nested_circles():
         ncpl = 300
 
         theta = np.arange(0.0, 2 * np.pi, 0.2)
@@ -311,86 +326,92 @@ def voronoi_nested_circles(self, function_tmpdir):
         max_area = 100
         angle = 30
 
-        tri = Triangle(
-            maximum_area=max_area, angle=angle, model_ws=str(function_tmpdir)
-        )
-        for poly in polys:
-            tri.add_polygon(poly)
-        tri.add_hole((25, 25))
-        tri.build(verbose=False)
-        vor = VoronoiGrid(tri)
-        gridprops = vor.get_gridprops_vertexgrid()
-        grid = VertexGrid(**gridprops, nlay=1)
+        with TemporaryDirectory() as tempdir:
+            tri = Triangle(
+                maximum_area=max_area, angle=angle, model_ws=str(Path(tempdir))
+            )
+            for poly in polys:
+                tri.add_polygon(poly)
+            tri.add_hole((25, 25))
+            tri.build(verbose=False)
+            vor = VoronoiGrid(tri)
+            gridprops = vor.get_gridprops_vertexgrid()
+            grid = VertexGrid(**gridprops, nlay=1)
 
         return ncpl, vor, gridprops, grid
 
-    def voronoi_polygons(self, function_tmpdir):
+    @staticmethod
+    def voronoi_polygons():
         ncpl = 410
         active_domain = [(0, 0), (100, 0), (100, 100), (0, 100)]
         area1 = [(10, 10), (40, 10), (40, 40), (10, 40)]
         area2 = [(60, 60), (80, 60), (80, 80), (60, 80)]
-        tri = Triangle(angle=30, model_ws=str(function_tmpdir))
-        tri.add_polygon(active_domain)
-        tri.add_polygon(area1)
-        tri.add_polygon(area2)
-        tri.add_region(
-            (1, 1), 0, maximum_area=100
-        )  # point inside active domain
-        tri.add_region((11, 11), 1, maximum_area=10)  # point inside area1
-        tri.add_region((61, 61), 2, maximum_area=3)  # point inside area2
-        tri.build(verbose=False)
-        vor = VoronoiGrid(tri)
-        gridprops = vor.get_gridprops_vertexgrid()
-        grid = VertexGrid(**gridprops, nlay=1)
+
+        with TemporaryDirectory() as tempdir:
+            tri = Triangle(angle=30, model_ws=str(Path(tempdir)))
+            tri.add_polygon(active_domain)
+            tri.add_polygon(area1)
+            tri.add_polygon(area2)
+            tri.add_region(
+                (1, 1), 0, maximum_area=100
+            )  # point inside active domain
+            tri.add_region((11, 11), 1, maximum_area=10)  # point inside area1
+            tri.add_region((61, 61), 2, maximum_area=3)  # point inside area2
+            tri.build(verbose=False)
+            vor = VoronoiGrid(tri)
+            gridprops = vor.get_gridprops_vertexgrid()
+            grid = VertexGrid(**gridprops, nlay=1)
 
         return ncpl, vor, gridprops, grid
 
-    def voronoi_many_polygons(self, function_tmpdir):
+    @staticmethod
+    def voronoi_many_polygons():
         ncpl = 1305
         active_domain = [(0, 0), (100, 0), (100, 100), (0, 100)]
         area1 = [(10, 10), (40, 10), (40, 40), (10, 40)]
         area2 = [(70, 70), (90, 70), (90, 90), (70, 90)]
 
-        tri = Triangle(angle=30, model_ws=str(function_tmpdir))
-
-        # requirement that active_domain is first polygon to be added
-        tri.add_polygon(active_domain)
-
-        # requirement that any holes be added next
-        theta = np.arange(0.0, 2 * np.pi, 0.2)
-        radius = 10.0
-        x = radius * np.cos(theta) + 50.0
-        y = radius * np.sin(theta) + 70.0
-        circle_poly0 = [(x, y) for x, y in zip(x, y)]
-        tri.add_polygon(circle_poly0)
-        tri.add_hole((50, 70))
-
-        # Add a polygon to force cells to conform to it
-        theta = np.arange(0.0, 2 * np.pi, 0.2)
-        radius = 10.0
-        x = radius * np.cos(theta) + 70.0
-        y = radius * np.sin(theta) + 20.0
-        circle_poly1 = [(x, y) for x, y in zip(x, y)]
-        tri.add_polygon(circle_poly1)
-        # tri.add_hole((70, 20))
-
-        # add line through domain to force conforming cells
-        line = [(x, x) for x in np.linspace(11, 89, 100)]
-        tri.add_polygon(line)
-
-        # then regions and other polygons should follow
-        tri.add_polygon(area1)
-        tri.add_polygon(area2)
-        tri.add_region(
-            (1, 1), 0, maximum_area=100
-        )  # point inside active domain
-        tri.add_region((11, 11), 1, maximum_area=10)  # point inside area1
-        tri.add_region((70, 70), 2, maximum_area=1)  # point inside area2
-
-        tri.build(verbose=False)
-
-        vor = VoronoiGrid(tri)
-        gridprops = vor.get_gridprops_vertexgrid()
-        grid = VertexGrid(**gridprops, nlay=1)
+        with TemporaryDirectory() as tempdir:
+            tri = Triangle(angle=30, model_ws=str(Path(tempdir)))
+
+            # requirement that active_domain is first polygon to be added
+            tri.add_polygon(active_domain)
+
+            # requirement that any holes be added next
+            theta = np.arange(0.0, 2 * np.pi, 0.2)
+            radius = 10.0
+            x = radius * np.cos(theta) + 50.0
+            y = radius * np.sin(theta) + 70.0
+            circle_poly0 = [(x, y) for x, y in zip(x, y)]
+            tri.add_polygon(circle_poly0)
+            tri.add_hole((50, 70))
+
+            # Add a polygon to force cells to conform to it
+            theta = np.arange(0.0, 2 * np.pi, 0.2)
+            radius = 10.0
+            x = radius * np.cos(theta) + 70.0
+            y = radius * np.sin(theta) + 20.0
+            circle_poly1 = [(x, y) for x, y in zip(x, y)]
+            tri.add_polygon(circle_poly1)
+            # tri.add_hole((70, 20))
+
+            # add line through domain to force conforming cells
+            line = [(x, x) for x in np.linspace(11, 89, 100)]
+            tri.add_polygon(line)
+
+            # then regions and other polygons should follow
+            tri.add_polygon(area1)
+            tri.add_polygon(area2)
+            tri.add_region(
+                (1, 1), 0, maximum_area=100
+            )  # point inside active domain
+            tri.add_region((11, 11), 1, maximum_area=10)  # point inside area1
+            tri.add_region((70, 70), 2, maximum_area=1)  # point inside area2
+
+            tri.build(verbose=False)
+
+            vor = VoronoiGrid(tri)
+            gridprops = vor.get_gridprops_vertexgrid()
+            grid = VertexGrid(**gridprops, nlay=1)
 
         return ncpl, vor, gridprops, grid