Update get_box_mesh.py

examples/combozzle-mpi.py

@@ -45,7 +45,8 @@
     get_sim_timestep,
     generate_and_distribute_mesh,
     write_visfile,
-    force_evaluation
+    force_evaluation,
+    get_box_mesh
 )
 from mirgecom.io import make_init_message
 from mirgecom.mpi import mpi_entry_point
@@ -88,20 +89,6 @@ class MyRuntimeError(RuntimeError):
 
 
 # Box grid generator widget lifted from @majosm and slightly bent
-def _get_box_mesh(dim, a, b, n, t=None, periodic=None):
-    if periodic is None:
-        periodic = (False)*dim
-
-    dim_names = ["x", "y", "z"]
-    bttf = {}
-    for i in range(dim):
-        bttf["-"+str(i+1)] = ["-"+dim_names[i]]
-        bttf["+"+str(i+1)] = ["+"+dim_names[i]]
-    from meshmode.mesh.generation import generate_regular_rect_mesh as gen
-    return gen(a=a, b=b, n=n, boundary_tag_to_face=bttf, mesh_type=t,
-               periodic=periodic)
-
-
 class InitSponge:
     r"""Solution initializer for flow in the ACT-II facility.
 
@@ -192,7 +179,7 @@ def main(use_logmgr=True,
     y_scale = 1
     z_scale = 1
 
-    # - params for unscaled npts/axis
+    # - params for unscaled nels/axis
     domain_xlen = .01
     domain_ylen = .01
     domain_zlen = .01
@@ -262,7 +249,7 @@ def main(use_logmgr=True,
     # }}}
 
     # coarse-scale grid/domain control
-    n_refine = 1  # scales npts/axis uniformly
+    n_refine = 1  # scales nels/axis uniformly
     weak_scale = 1  # scales domain uniformly, keeping dt constant
 
     # AV / Shock-capturing parameters
@@ -551,9 +538,9 @@ def main(use_logmgr=True,
     ncy = int(ysize / chlen)
     ncz = int(zsize / chlen)
 
-    npts_x = ncx * n_refine + 1
-    npts_y = ncy * n_refine + 1
-    npts_z = ncz * n_refine + 1
+    nels_x = ncx * n_refine
+    nels_y = ncy * n_refine
+    nels_z = ncz * n_refine
 
     x0 = xsize/2
     y0 = ysize/2
@@ -566,23 +553,23 @@ def main(use_logmgr=True,
     zback = z0 - zsize/2
     zfront = z0 + zsize/2
 
-    npts_axis = (npts_x,)
+    nels_axis = (nels_x,)
     box_ll = (xleft,)
     box_ur = (xright,)
     if dim > 1:
-        npts_axis = (npts_x, npts_y)
+        nels_axis = (nels_x, nels_y)
         box_ll = (xleft, ybottom)
         box_ur = (xright, ytop)
     if dim > 2:
-        npts_axis = (npts_x, npts_y, npts_z)
+        nels_axis = (nels_x, nels_y, nels_z)
         box_ll = (xleft, ybottom, zback)
         box_ur = (xright, ytop, zfront)
 
     periodic = (periodic_boundary == 1,)*dim
     if rank == 0:
         print(f"---- Mesh generator inputs -----\n"
               f"\tDomain: [{box_ll}, {box_ur}], {periodic=}\n"
-              f"\tNpts/axis: {npts_axis}")
+              f"\tNels/axis: {nels_axis}")
 
     if single_gas_only:
         inert_only = 1
@@ -618,7 +605,7 @@ def main(use_logmgr=True,
         rst_step = restart_data["step"]
         rst_order = restart_data["order"]
     else:  # generate the grid from scratch
-        generate_mesh = partial(_get_box_mesh, dim, a=box_ll, b=box_ur, n=npts_axis,
+        generate_mesh = partial(get_box_mesh, dim, a=box_ll, b=box_ur, n=nels_axis,
                                 periodic=periodic)
 
         local_mesh, global_nelements = generate_and_distribute_mesh(comm,

examples/hotplate-mpi.py

@@ -35,7 +35,10 @@
 from mirgecom.discretization import create_discretization_collection
 from mirgecom.fluid import make_conserved
 from mirgecom.navierstokes import ns_operator
-from mirgecom.simutil import get_sim_timestep
+from mirgecom.simutil import (
+    get_sim_timestep,
+    get_box_mesh
+)
 
 from mirgecom.io import make_init_message
 from mirgecom.mpi import mpi_entry_point
@@ -68,17 +71,6 @@ class MyRuntimeError(RuntimeError):
     pass
 
 
-# Box grid generator widget lifted from @majosm and slightly bent
-def _get_box_mesh(dim, a, b, n, t=None):
-    dim_names = ["x", "y", "z"]
-    bttf = {}
-    for i in range(dim):
-        bttf["-"+str(i+1)] = ["-"+dim_names[i]]
-        bttf["+"+str(i+1)] = ["+"+dim_names[i]]
-    from meshmode.mesh.generation import generate_regular_rect_mesh as gen
-    return gen(a=a, b=b, n=n, boundary_tag_to_face=bttf, mesh_type=t)
-
-
 @mpi_entry_point
 def main(use_logmgr=True,
          use_leap=False, casename=None,
@@ -144,12 +136,12 @@ def main(use_logmgr=True,
         assert restart_data["nparts"] == nparts
     else:  # generate the grid from scratch
         n_refine = 2
-        npts_x = 6 * n_refine
-        npts_y = 4 * n_refine
-        npts_axis = (npts_x, npts_y)
+        nels_x = 5 * n_refine
+        nels_y = 3 * n_refine
+        nels_axis = (nels_x, nels_y)
         box_ll = (left_boundary_location, bottom_boundary_location)
         box_ur = (right_boundary_location, top_boundary_location)
-        generate_mesh = partial(_get_box_mesh, 2, a=box_ll, b=box_ur, n=npts_axis)
+        generate_mesh = partial(get_box_mesh, 2, a=box_ll, b=box_ur, n=nels_axis)
         from mirgecom.simutil import generate_and_distribute_mesh
         local_mesh, global_nelements = generate_and_distribute_mesh(comm,
                                                                     generate_mesh)

examples/poiseuille-mpi.py

@@ -27,7 +27,6 @@
 import numpy as np
 from pytools.obj_array import make_obj_array
 from functools import partial
-
 from meshmode.mesh import BTAG_ALL, BTAG_NONE  # noqa
 
 from grudge.shortcuts import make_visualizer
@@ -36,8 +35,10 @@
 from mirgecom.discretization import create_discretization_collection
 from mirgecom.fluid import make_conserved
 from mirgecom.navierstokes import ns_operator
-from mirgecom.simutil import get_sim_timestep
-
+from mirgecom.simutil import (
+    get_sim_timestep,
+    get_box_mesh
+)
 from mirgecom.io import make_init_message
 from mirgecom.mpi import mpi_entry_point
 from mirgecom.integrators import rk4_step
@@ -59,7 +60,6 @@
     set_sim_state
 )
 
-
 logger = logging.getLogger(__name__)
 
 
@@ -69,17 +69,6 @@ class MyRuntimeError(RuntimeError):
     pass
 
 
-# Box grid generator widget lifted from @majosm and slightly bent
-def _get_box_mesh(dim, a, b, n, t=None):
-    dim_names = ["x", "y", "z"]
-    bttf = {}
-    for i in range(dim):
-        bttf["-"+str(i+1)] = ["-"+dim_names[i]]
-        bttf["+"+str(i+1)] = ["+"+dim_names[i]]
-    from meshmode.mesh.generation import generate_regular_rect_mesh as gen
-    return gen(a=a, b=b, n=n, boundary_tag_to_face=bttf, mesh_type=t)
-
-
 @mpi_entry_point
 def main(use_logmgr=True,
          use_overintegration=False,
@@ -145,13 +134,13 @@ def main(use_logmgr=True,
         global_nelements = restart_data["global_nelements"]
         assert restart_data["nparts"] == nparts
     else:  # generate the grid from scratch
-        n_refine = 5
-        npts_x = 10 * n_refine
-        npts_y = 6 * n_refine
-        npts_axis = (npts_x, npts_y)
+        n_refine = 2
+        nels_x = 9 * n_refine
+        nels_y = 5 * n_refine
+        nels_axis = (nels_x, nels_y)
         box_ll = (left_boundary_location, ybottom)
         box_ur = (right_boundary_location, ytop)
-        generate_mesh = partial(_get_box_mesh, 2, a=box_ll, b=box_ur, n=npts_axis)
+        generate_mesh = partial(get_box_mesh, 2, a=box_ll, b=box_ur, n=nels_axis)
         from mirgecom.simutil import generate_and_distribute_mesh
         local_mesh, global_nelements = generate_and_distribute_mesh(comm,
                                                                     generate_mesh)

mirgecom/simutil.py

@@ -25,6 +25,7 @@
 .. autofunction:: geometric_mesh_partitioner
 .. autofunction:: distribute_mesh
 .. autofunction:: get_number_of_tetrahedron_nodes
+.. autofunction:: get_box_mesh
 
 Simulation support utilities
 ----------------------------
@@ -97,6 +98,62 @@ def get_number_of_tetrahedron_nodes(dim, order, include_faces=False):
     return nnodes
 
 
+def get_box_mesh(dim, a, b, n, t=None, periodic=None):
+    """
+    Create a rectangular "box" like mesh with tagged boundary faces.
+
+    The resulting mesh has boundary tags
+    `"-i"` and `"+i"` for `i=1,...,dim`
+    corresponding to lower and upper faces normal to coordinate dimension `i`.
+
+    Parameters
+    ----------
+    dim: int
+        The mesh topological dimension
+    a: float or tuple
+        The coordinates of the lower corner of the box. If scalar-valued, gets
+        promoted to a uniform tuple.
+    b: float or tuple
+        The coordinates of the upper corner of the box. If scalar-valued, gets
+        promoted to a uniform tuple.
+    n: int or tuple
+        The number of elements along a given dimension. If scalar-valued, gets
+        promoted to a uniform tuple.
+    t: str or None
+        The mesh type. See
+        :func:`meshmode.mesh.generation.generate_box_mesh` for details.
+    periodic: bool or tuple or None
+        Indicates whether the mesh is periodic in a given dimension. If
+        scalar-valued, gets promoted to a uniform tuple.
+
+    Returns
+    -------
+    :class:`meshmode.mesh.Mesh`
+        The generated box mesh.
+    """
+    if np.isscalar(a):
+        a = (a,)*dim
+    if np.isscalar(b):
+        b = (b,)*dim
+    if np.isscalar(n):
+        n = (n,)*dim
+    if periodic is None:
+        periodic = (False,)*dim
+    elif np.isscalar(periodic):
+        periodic = (periodic,)*dim
+
+    dim_names = ["x", "y", "z"]
+    bttf = {}
+    for i in range(dim):
+        bttf["-"+str(i+1)] = ["-"+dim_names[i]]
+        bttf["+"+str(i+1)] = ["+"+dim_names[i]]
+
+    from meshmode.mesh.generation import generate_regular_rect_mesh as gen
+    return gen(a=a, b=b, nelements_per_axis=n,
+               boundary_tag_to_face=bttf,
+               mesh_type=t, periodic=periodic)
+
+
 def check_step(step, interval):
     """
     Check step number against a user-specified interval.

test/test_av.py

@@ -54,7 +54,7 @@
 from pyopencl.tools import (  # noqa
     pytest_generate_tests_for_pyopencl as pytest_generate_tests,
 )
-
+from mirgecom.simutil import get_box_mesh
 from pytools.obj_array import make_obj_array
 
 logger = logging.getLogger(__name__)
@@ -337,18 +337,6 @@ def test_trig(ctx_factory, dim, order):
     )
 
 
-# Box grid generator widget lifted from @majosm's diffusion tester
-def _get_box_mesh(dim, a, b, n):
-    dim_names = ["x", "y", "z"]
-    boundary_tag_to_face = {}
-    for i in range(dim):
-        boundary_tag_to_face["-"+str(i+1)] = ["-"+dim_names[i]]
-        boundary_tag_to_face["+"+str(i+1)] = ["+"+dim_names[i]]
-    from meshmode.mesh.generation import generate_regular_rect_mesh
-    return generate_regular_rect_mesh(a=(a,)*dim, b=(b,)*dim, n=(n,)*dim,
-        boundary_tag_to_face=boundary_tag_to_face)
-
-
 class _VortexSoln:
 
     def __init__(self, **kwargs):
@@ -411,10 +399,10 @@ def _boundary_state_func(dcoll, dd_bdry, gas_model, state_minus, **kwargs):
         return make_fluid_state(prescribed_soln(r=nodes, eos=gas_model.eos,
                                             **kwargs), gas_model)
 
-    npts_geom = 17
+    nels_geom = 16
     a = 1.0
     b = 2.0
-    mesh = _get_box_mesh(dim=dim, a=a, b=b, n=npts_geom)
+    mesh = get_box_mesh(dim=dim, a=a, b=b, n=nels_geom)
     from mirgecom.discretization import create_discretization_collection
     dcoll = create_discretization_collection(actx, mesh, order=order)
     nodes = actx.thaw(dcoll.nodes())