From 2a288dc9bcf29444626da38e8c63a018b3cd85c6 Mon Sep 17 00:00:00 2001 From: Matthew Smith Date: Mon, 15 Mar 2021 13:42:03 -0500 Subject: [PATCH] remove usage of deprecated n parameter --- examples/simple-dg.py | 2 +- examples/to_firedrake.py | 2 +- test/test_array.py | 4 +-- test/test_chained.py | 3 +- test/test_firedrake_interop.py | 6 ++-- test/test_interop.py | 2 +- test/test_mesh.py | 2 +- test/test_meshmode.py | 51 ++++++++++++++++++---------------- test/test_partition.py | 26 ++++++++--------- test/test_refinement.py | 7 +++-- 10 files changed, 57 insertions(+), 48 deletions(-) diff --git a/examples/simple-dg.py b/examples/simple-dg.py index dacdff13..65450458 100644 --- a/examples/simple-dg.py +++ b/examples/simple-dg.py @@ -461,7 +461,7 @@ def main(): mesh = generate_regular_rect_mesh( a=(-0.5, -0.5), b=(0.5, 0.5), - n=(nel_1d, nel_1d)) + nelements_per_axis=(nel_1d, nel_1d)) order = 3 diff --git a/examples/to_firedrake.py b/examples/to_firedrake.py index 395211ca..83024f73 100644 --- a/examples/to_firedrake.py +++ b/examples/to_firedrake.py @@ -57,7 +57,7 @@ def main(): mesh = generate_regular_rect_mesh( a=(-0.5, -0.5), b=(0.5, 0.5), - n=(nel_1d, nel_1d)) + nelements_per_axis=(nel_1d, nel_1d)) order = 3 diff --git a/test/test_array.py b/test/test_array.py index 2f089a05..bb132b52 100644 --- a/test/test_array.py +++ b/test/test_array.py @@ -42,7 +42,7 @@ def test_array_context_np_workalike(actx_factory): from meshmode.mesh.generation import generate_regular_rect_mesh mesh = generate_regular_rect_mesh( - a=(-0.5,)*2, b=(0.5,)*2, n=(8,)*2, order=3) + a=(-0.5,)*2, b=(0.5,)*2, nelements_per_axis=(8,)*2, order=3) discr = Discretization(actx, mesh, PolynomialWarpAndBlendGroupFactory(3)) @@ -86,7 +86,7 @@ def test_dof_array_arithmetic_same_as_numpy(actx_factory): from meshmode.mesh.generation import generate_regular_rect_mesh mesh = generate_regular_rect_mesh( - a=(-0.5,)*2, b=(0.5,)*2, n=(3,)*2, order=1) + a=(-0.5,)*2, b=(0.5,)*2, nelements_per_axis=(2,)*2, order=1) discr = Discretization(actx, mesh, PolynomialWarpAndBlendGroupFactory(3)) diff --git a/test/test_chained.py b/test/test_chained.py index 70296c6f..19a89316 100644 --- a/test/test_chained.py +++ b/test/test_chained.py @@ -63,7 +63,8 @@ def create_discretization(actx, ndim, mesh = generate_torus(10.0, 5.0, order=order, n_minor=nelements, n_major=nelements) elif mesh_name == "warp": - mesh = generate_warped_rect_mesh(ndim, order=order, n=nelements) + mesh = generate_warped_rect_mesh(ndim, order=order, + nelements_side=nelements) else: raise ValueError(f"unknown mesh name: {mesh_name}") else: diff --git a/test/test_firedrake_interop.py b/test/test_firedrake_interop.py index 045978c8..e971ec62 100644 --- a/test/test_firedrake_interop.py +++ b/test/test_firedrake_interop.py @@ -435,7 +435,8 @@ def test_from_fd_transfer(ctx_factory, fspace_degree, elif fdrake_mesh_name == "warp": from meshmode.mesh.generation import generate_warped_rect_mesh from meshmode.interop.firedrake import export_mesh_to_firedrake - mm_mesh = generate_warped_rect_mesh(dim, order=4, n=mesh_par) + mm_mesh = generate_warped_rect_mesh(dim, order=4, + nelements_side=mesh_par) fdrake_mesh, _, _ = export_mesh_to_firedrake(mm_mesh) h = 1/mesh_par else: @@ -531,7 +532,8 @@ def test_to_fd_transfer(ctx_factory, fspace_degree, mesh_name, mesh_pars, dim): h = float(mesh_par) elif mesh_name == "warp": from meshmode.mesh.generation import generate_warped_rect_mesh - mm_mesh = generate_warped_rect_mesh(dim, order=4, n=mesh_par) + mm_mesh = generate_warped_rect_mesh(dim, order=4, + nelements_side=mesh_par) h = 1/mesh_par else: raise ValueError("mesh_name not recognized") diff --git a/test/test_interop.py b/test/test_interop.py index 8cbfb8fd..1ba5e700 100644 --- a/test/test_interop.py +++ b/test/test_interop.py @@ -47,7 +47,7 @@ def test_nodal_dg_interop(actx_factory, dim): from meshmode.mesh.generation import generate_regular_rect_mesh mesh = generate_regular_rect_mesh( - a=(-0.5,)*dim, b=(0.5,)*dim, n=(8,)*dim, order=order) + a=(-0.5,)*dim, b=(0.5,)*dim, nelements_per_axis=(8,)*dim, order=order) from meshmode.interop.nodal_dg import NodalDGContext with NodalDGContext("./nodal-dg/Codes1.1") as ndgctx: diff --git a/test/test_mesh.py b/test/test_mesh.py index 1bf76851..828ac3d9 100644 --- a/test/test_mesh.py +++ b/test/test_mesh.py @@ -40,7 +40,7 @@ def test_nonequal_rect_mesh_generation(actx_factory, visualize=False): actx = actx_factory() mesh = mgen.generate_regular_rect_mesh( - a=(0, 0)*2, b=(5, 3), n=(10, 6,), order=3) + a=(0, 0)*2, b=(5, 3), npoints_per_axis=(10, 6,), order=3) from meshmode.discretization import Discretization from meshmode.discretization.poly_element import \ diff --git a/test/test_meshmode.py b/test/test_meshmode.py index d64d376c..00f797b8 100644 --- a/test/test_meshmode.py +++ b/test/test_meshmode.py @@ -108,7 +108,7 @@ def test_parallel_vtk_file(actx_factory, dim): elif dim == 2: mesh = mgen.generate_torus(5.0, 1.0, order=target_order) elif dim == 3: - mesh = mgen.generate_warped_rect_mesh(dim, target_order, 5) + mesh = mgen.generate_warped_rect_mesh(dim, target_order, nelements_side=4) else: raise ValueError("unknown dimensionality") @@ -174,15 +174,16 @@ def test_visualizers(actx_factory, dim, group_cls): mesh = mgen.generate_torus(5.0, 1.0, order=target_order) else: mesh = mgen.generate_regular_rect_mesh( - a=(0,)*dim, b=(1,)*dim, n=(5,)*dim, + a=(0,)*dim, b=(1,)*dim, nelements_per_axis=(4,)*dim, group_cls=group_cls, order=target_order) elif dim == 3: if is_simplex: - mesh = mgen.generate_warped_rect_mesh(dim, target_order, 5) + mesh = mgen.generate_warped_rect_mesh(dim, target_order, + nelements_side=4) else: mesh = mgen.generate_regular_rect_mesh( - a=(0,)*dim, b=(1,)*dim, n=(5,)*dim, + a=(0,)*dim, b=(1,)*dim, nelements_per_axis=(4,)*dim, group_cls=group_cls, order=target_order) else: @@ -361,23 +362,23 @@ def test_box_boundary_tags(dim, nelem, mesh_type, group_cls, visualize=False): if dim == 1: a = (0,) b = (1,) - n = (nelem,) + nelements_per_axis = (nelem,) btag_to_face = {"btag_test_1": ["+x"], "btag_test_2": ["-x"]} elif dim == 2: a = (0, -1) b = (1, 1) - n = (nelem, nelem) + nelements_per_axis = (nelem,)*2 btag_to_face = {"btag_test_1": ["+x", "-y"], "btag_test_2": ["+y", "-x"]} elif dim == 3: a = (0, -1, -1) b = (1, 1, 1) - n = (nelem, nelem, nelem) + nelements_per_axis = (nelem,)*3 btag_to_face = {"btag_test_1": ["+x", "-y", "-z"], "btag_test_2": ["+y", "-x", "+z"]} mesh = mgen.generate_regular_rect_mesh(a=a, b=b, - n=n, order=3, + nelements_per_axis=nelements_per_axis, order=3, boundary_tag_to_face=btag_to_face, group_cls=group_cls, mesh_type=mesh_type) @@ -392,9 +393,9 @@ def test_box_boundary_tags(dim, nelem, mesh_type, group_cls, visualize=False): if dim == 1: num_on_bdy = 1 elif group_cls is TensorProductElementGroup: - num_on_bdy = dim * (nelem-1)**(dim-1) + num_on_bdy = dim * nelem**(dim-1) elif group_cls is SimplexElementGroup: - num_on_bdy = dim * (dim-1) * (nelem-1)**(dim-1) + num_on_bdy = dim * (dim-1) * nelem**(dim-1) else: assert False @@ -504,14 +505,15 @@ def test_boundary_interpolation(actx_factory, group_factory, boundary_tag, "blob2d-order%d-h%s.msh" % (order, mesh_par), force_ambient_dim=2) elif mesh_name == "warp": - mesh = mgen.generate_warped_rect_mesh(dim, order=order, n=mesh_par, - group_cls=group_cls) + mesh = mgen.generate_warped_rect_mesh(dim, order=order, + nelements_side=mesh_par, group_cls=group_cls) h = 1/mesh_par elif mesh_name == "rect": mesh = mgen.generate_regular_rect_mesh(a=(0,)*dim, b=(1,)*dim, - order=order, n=(mesh_par,)*dim, group_cls=group_cls) + order=order, nelements_per_axis=(mesh_par,)*dim, + group_cls=group_cls) h = 1/mesh_par else: @@ -616,8 +618,8 @@ def test_all_faces_interpolation(actx_factory, group_factory, ) print("END GEN") elif mesh_name == "warp": - mesh = mgen.generate_warped_rect_mesh(dim, order=4, n=mesh_par, - group_cls=group_cls) + mesh = mgen.generate_warped_rect_mesh(dim, order=4, + nelements_side=mesh_par, group_cls=group_cls) h = 1/mesh_par else: @@ -747,8 +749,8 @@ def test_opposite_face_interpolation(actx_factory, group_factory, ) print("END GEN") elif mesh_name == "warp": - mesh = mgen.generate_warped_rect_mesh(dim, order=order, n=mesh_par, - group_cls=group_cls) + mesh = mgen.generate_warped_rect_mesh(dim, order=order, + nelements_side=mesh_par, group_cls=group_cls) h = 1/mesh_par else: @@ -900,8 +902,9 @@ def test_merge_and_map(actx_factory, group_cls, visualize=False): else: ambient_dim = 3 mesh = mgen.generate_regular_rect_mesh( - a=(0,)*ambient_dim, b=(1,)*ambient_dim, n=(4,)*ambient_dim, - order=mesh_order, group_cls=group_cls) + a=(0,)*ambient_dim, b=(1,)*ambient_dim, + nelements_per_axis=(4,)*ambient_dim, order=mesh_order, + group_cls=group_cls) discr_grp_factory = LegendreGaussLobattoTensorProductGroupFactory(order) @@ -1563,10 +1566,10 @@ def test_open_curved_mesh(curve_name): closed=closed) -def _generate_cross_warped_rect_mesh(dim, order, n): +def _generate_cross_warped_rect_mesh(dim, order, nelements_side): mesh = mgen.generate_regular_rect_mesh( a=(0,)*dim, b=(1,)*dim, - n=(n,)*dim, order=order) + nelements_per_axis=(nelements_side,)*dim, order=order) def m(x): results = np.empty_like(x) @@ -1593,11 +1596,11 @@ def test_is_affine_group_check(mesh_name): is_affine = True mesh = mgen.generate_regular_rect_mesh( a=(-0.5,)*dim, b=(0.5,)*dim, - n=(nelements,)*dim, order=order) + nelements_per_axis=(nelements,)*dim, order=order) elif mesh_name.startswith("warped_box"): dim = int(mesh_name[-2]) is_affine = False - mesh = mgen.generate_warped_rect_mesh(dim, order, nelements) + mesh = mgen.generate_warped_rect_mesh(dim, order, nelements_side=nelements) elif mesh_name == "cross_warped_box": dim = 2 is_affine = False @@ -1632,7 +1635,7 @@ def test_mesh_multiple_groups(actx_factory, ambient_dim, visualize=False): mesh = mgen.generate_regular_rect_mesh( a=(-0.5,)*ambient_dim, b=(0.5,)*ambient_dim, - n=(8,)*ambient_dim, order=order) + nelements_per_axis=(8,)*ambient_dim, order=order) assert len(mesh.groups) == 1 from meshmode.mesh.processing import split_mesh_groups diff --git a/test/test_partition.py b/test/test_partition.py index 94cfc059..376122a4 100644 --- a/test/test_partition.py +++ b/test/test_partition.py @@ -72,7 +72,7 @@ def test_partition_interpolation(actx_factory, dim, mesh_pars, for n in mesh_pars: from meshmode.mesh.generation import generate_warped_rect_mesh - base_mesh = generate_warped_rect_mesh(dim, order=order, n=n) + base_mesh = generate_warped_rect_mesh(dim, order=order, nelements_side=n) if num_groups > 1: from meshmode.mesh.processing import split_mesh_groups @@ -173,22 +173,22 @@ def test_partition_interpolation(actx_factory, dim, mesh_pars, @pytest.mark.parametrize(("dim", "mesh_size", "num_parts", "scramble_partitions"), [ - (2, 5, 4, False), - (2, 5, 4, True), - (2, 5, 5, False), - (2, 5, 5, True), - (2, 5, 7, False), - (2, 5, 7, True), - (2, 10, 32, False), - (3, 8, 32, False), + (2, 4, 4, False), + (2, 4, 4, True), + (2, 4, 5, False), + (2, 4, 5, True), + (2, 4, 7, False), + (2, 4, 7, True), + (2, 9, 32, False), + (3, 7, 32, False), ]) @pytest.mark.parametrize("num_groups", [1, 2, 7]) def test_partition_mesh(mesh_size, num_parts, num_groups, dim, scramble_partitions): np.random.seed(42) - n = (mesh_size,) * dim + nelements_per_axis = (mesh_size,) * dim from meshmode.mesh.generation import generate_regular_rect_mesh - meshes = [generate_regular_rect_mesh(a=(0 + i,) * dim, b=(1 + i,) * dim, n=n) - for i in range(num_groups)] + meshes = [generate_regular_rect_mesh(a=(0 + i,) * dim, b=(1 + i,) * dim, + nelements_per_axis=nelements_per_axis) for i in range(num_groups)] from meshmode.mesh.processing import merge_disjoint_meshes mesh = merge_disjoint_meshes(meshes) @@ -326,7 +326,7 @@ def _test_mpi_boundary_swap(dim, order, num_groups): if mesh_dist.is_mananger_rank(): np.random.seed(42) from meshmode.mesh.generation import generate_warped_rect_mesh - meshes = [generate_warped_rect_mesh(dim, order=order, n=4) + meshes = [generate_warped_rect_mesh(dim, order=order, nelements_side=4) for _ in range(num_groups)] if num_groups > 1: diff --git a/test/test_refinement.py b/test/test_refinement.py index ca748e4f..7d0c0b02 100644 --- a/test/test_refinement.py +++ b/test/test_refinement.py @@ -225,8 +225,11 @@ def test_refinement_connection( mesh = get_blob_mesh(mesh_par, mesh_order) h = float(mesh_par) elif mesh_name == "warp": - mesh = mgen.generate_warped_rect_mesh(dim, order=mesh_order, n=mesh_par, - group_cls=group_cls) + # FIXME: Leftover from n -> nelements_per_axis/npoints_per_axis change; + # should be nelements_per_axis, but if changed EOC order dips below + # threshold and test fails. Likely just need to tweak mesh sizes. + mesh = mgen.generate_warped_rect_mesh(dim, order=mesh_order, + npoints_side=mesh_par, group_cls=group_cls) h = 1/mesh_par else: raise ValueError("mesh_name not recognized") -- GitLab