Merge branch 'build-production' into production

examples/advdiff-tpe.py

@@ -149,11 +149,11 @@ def main(actx_class, use_overintegration=False, use_esdg=False,
                                              tensor_product_elements=use_tpe)
     nodes = actx.thaw(dcoll.nodes())
 
-    from grudge.dof_desc import DISCR_TAG_QUAD
+    from grudge.dof_desc import DISCR_TAG_BASE, DISCR_TAG_QUAD
     if use_overintegration:
         quadrature_tag = DISCR_TAG_QUAD
     else:
-        quadrature_tag = None
+        quadrature_tag = DISCR_TAG_BASE
 
     def _limit_fluid_cv(cv, temperature_seed=None, gas_model=None, dd=None):
         actx = cv.array_context

examples/advection_diffusion_reaction.py

@@ -192,7 +192,7 @@ def main(actx_class, use_overintegration=False, casename=None, rst_filename=None
     kappa = 0.01
 
     from grudge.dt_utils import characteristic_lengthscales
-    dx = np.min(actx.to_numpy(characteristic_lengthscales(actx, dcoll)))
+    dx = actx.to_numpy(actx.np.min(characteristic_lengthscales(actx, dcoll)))
     inv_dt = dx / wave_speed
     visc_dt = dx**2 / kappa
 

examples/blasius.py

@@ -288,7 +288,7 @@ def _get_fluid_state(cv):
         current_t = restart_data["t"]
         current_step = restart_step
         if np.isscalar(current_t) is False:
-            current_t = np.min(actx.to_numpy(current_t))
+            current_t = actx.to_numpy(actx.np.min(current_t))
 
         current_cv = restart_data["state"]
 
@@ -441,7 +441,7 @@ def my_rhs(t, state):
                            quadrature_tag=quadrature_tag)
 
     def my_post_step(step, t, dt, state):
-        min_dt = np.min(actx.to_numpy(dt)) if local_dt else dt
+        min_dt = actx.to_numpy(actx.np.min(dt)) if local_dt else dt
         if logmgr:
             set_dt(logmgr, min_dt)
             logmgr.tick_after()

examples/combozzle.py

@@ -31,7 +31,7 @@
 
 from meshmode.mesh import BTAG_ALL, BTAG_NONE  # noqa
 from grudge.shortcuts import make_visualizer
-from grudge.dof_desc import BoundaryDomainTag, DISCR_TAG_QUAD
+from grudge.dof_desc import BoundaryDomainTag, DISCR_TAG_BASE, DISCR_TAG_QUAD
 from mirgecom.discretization import create_discretization_collection
 
 
@@ -653,7 +653,7 @@ def vol_max(x):
     if use_overintegration:
         quadrature_tag = DISCR_TAG_QUAD
     else:
-        quadrature_tag = None
+        quadrature_tag = DISCR_TAG_BASE
 
     ones = dcoll.zeros(actx) + 1.0
 

examples/doublemach.py

@@ -177,11 +177,11 @@ def main(actx_class, use_esdg=False,
     dcoll = create_discretization_collection(actx, local_mesh, order=order)
     nodes = actx.thaw(dcoll.nodes())
 
-    from grudge.dof_desc import DISCR_TAG_QUAD
+    from grudge.dof_desc import DISCR_TAG_BASE, DISCR_TAG_QUAD
     if use_overintegration:
         quadrature_tag = DISCR_TAG_QUAD
     else:
-        quadrature_tag = None  # noqa
+        quadrature_tag = DISCR_TAG_BASE
 
     dim = 2
     if logmgr:

examples/doublemach_physical_av.py

@@ -209,11 +209,11 @@ def _compiled_stepper_wrapper(state, t, dt, rhs):
     dcoll = create_discretization_collection(actx, local_mesh, order=order)
     nodes = actx.thaw(dcoll.nodes())
 
-    from grudge.dof_desc import DISCR_TAG_QUAD
+    from grudge.dof_desc import DISCR_TAG_BASE, DISCR_TAG_QUAD
     if use_overintegration:
         quadrature_tag = DISCR_TAG_QUAD
     else:
-        quadrature_tag = None  # noqa
+        quadrature_tag = DISCR_TAG_BASE
 
     dim = 2
     if logmgr:

examples/heat-source.py

@@ -116,11 +116,11 @@ def main(actx_class, use_esdg=False,
 
     dcoll = create_discretization_collection(actx, local_mesh, order=order)
 
-    from grudge.dof_desc import DISCR_TAG_QUAD
+    from grudge.dof_desc import DISCR_TAG_BASE, DISCR_TAG_QUAD
     if use_overintegration:
         quadrature_tag = DISCR_TAG_QUAD
     else:
-        quadrature_tag = None  # noqa
+        quadrature_tag = DISCR_TAG_BASE
 
     if dim == 2:
         # no deep meaning here, just a fudge factor

examples/hotplate.py

@@ -147,11 +147,11 @@ def main(actx_class, use_esdg=False, use_leap=False, casename=None,
     dcoll = create_discretization_collection(actx, local_mesh, order=order)
     nodes = actx.thaw(dcoll.nodes())
 
-    from grudge.dof_desc import DISCR_TAG_QUAD
+    from grudge.dof_desc import DISCR_TAG_BASE, DISCR_TAG_QUAD
     if use_overintegration:
         quadrature_tag = DISCR_TAG_QUAD
     else:
-        quadrature_tag = None
+        quadrature_tag = DISCR_TAG_BASE
 
     if logmgr:
         logmgr_add_cl_device_info(logmgr, queue)

examples/lump.py

@@ -27,7 +27,7 @@
 import numpy as np
 from functools import partial
 
-from grudge.dof_desc import DISCR_TAG_QUAD
+from grudge.dof_desc import DISCR_TAG_BASE, DISCR_TAG_QUAD
 from meshmode.mesh import BTAG_ALL, BTAG_NONE  # noqa
 from grudge.shortcuts import make_visualizer
 
@@ -141,7 +141,7 @@ def main(actx_class, use_esdg=False,
     if use_overintegration:
         quadrature_tag = DISCR_TAG_QUAD
     else:
-        quadrature_tag = None
+        quadrature_tag = DISCR_TAG_BASE
 
     vis_timer = None
 

examples/mixture-tpe.py

@@ -29,7 +29,7 @@
 
 from meshmode.mesh import BTAG_ALL
 from grudge.shortcuts import make_visualizer
-from grudge.dof_desc import DISCR_TAG_QUAD
+from grudge.dof_desc import DISCR_TAG_BASE, DISCR_TAG_QUAD
 
 from mirgecom.discretization import create_discretization_collection
 from mirgecom.euler import euler_operator
@@ -151,7 +151,7 @@ def main(actx_class, use_esdg=False,
     if use_overintegration:
         quadrature_tag = DISCR_TAG_QUAD
     else:
-        quadrature_tag = None
+        quadrature_tag = DISCR_TAG_BASE
 
     vis_timer = None
 

examples/mixture.py

@@ -29,7 +29,7 @@
 
 from meshmode.mesh import BTAG_ALL
 from grudge.shortcuts import make_visualizer
-from grudge.dof_desc import DISCR_TAG_QUAD
+from grudge.dof_desc import DISCR_TAG_BASE, DISCR_TAG_QUAD
 
 from mirgecom.discretization import create_discretization_collection
 from mirgecom.euler import euler_operator
@@ -145,7 +145,7 @@ def main(actx_class, use_esdg=False,
     if use_overintegration:
         quadrature_tag = DISCR_TAG_QUAD
     else:
-        quadrature_tag = None
+        quadrature_tag = DISCR_TAG_BASE
 
     vis_timer = None
 

examples/multiple-volumes.py

@@ -162,7 +162,7 @@ def main(actx_class, use_esdg=False,
     if use_overintegration:
         quadrature_tag = DISCR_TAG_QUAD
     else:
-        quadrature_tag = None
+        quadrature_tag = DISCR_TAG_BASE
 
     vis_timer = None
 

examples/poiseuille-multispecies.py

@@ -36,8 +36,10 @@
 
 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
@@ -69,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(actx_class, use_overintegration=False, use_leap=False, casename=None,
          rst_filename=None, use_esdg=False):
@@ -130,8 +121,8 @@ def main(actx_class, use_overintegration=False, use_leap=False, casename=None,
     xlen = right_boundary_location - left_boundary_location
     ylen = ytop - ybottom
     n_refine = 1
-    npts_x = n_refine*int(xlen / x_ch)
-    npts_y = n_refine*int(ylen / x_ch)
+    nels_x = n_refine*int(xlen / x_ch)
+    nels_y = n_refine*int(ylen / x_ch)
 
     rst_path = "restart_data/"
     rst_pattern = (
@@ -147,10 +138,10 @@ def main(actx_class, use_overintegration=False, use_leap=False, casename=None,
         global_nelements = restart_data["global_nelements"]
         assert restart_data["nparts"] == nparts
     else:  # generate the grid from scratch
-        npts_axis = (npts_x, npts_y)
+        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)
@@ -160,11 +151,11 @@ def main(actx_class, use_overintegration=False, use_leap=False, casename=None,
     dcoll = create_discretization_collection(actx, local_mesh, order)
     nodes = actx.thaw(dcoll.nodes())
 
-    from grudge.dof_desc import DISCR_TAG_QUAD
+    from grudge.dof_desc import DISCR_TAG_BASE, DISCR_TAG_QUAD
     if use_overintegration:
         quadrature_tag = DISCR_TAG_QUAD
     else:
-        quadrature_tag = None
+        quadrature_tag = DISCR_TAG_BASE
 
     if logmgr:
         logmgr_add_device_name(logmgr, queue)

examples/poiseuille-tpe.py

@@ -30,7 +30,7 @@
 from meshmode.mesh import BTAG_ALL, BTAG_NONE  # noqa
 
 from grudge.shortcuts import make_visualizer
-from grudge.dof_desc import BoundaryDomainTag, DISCR_TAG_QUAD
+from grudge.dof_desc import BoundaryDomainTag, DISCR_TAG_BASE, DISCR_TAG_QUAD
 
 from mirgecom.discretization import create_discretization_collection
 from mirgecom.fluid import make_conserved
@@ -157,7 +157,7 @@ def main(actx_class, use_esdg=False, use_overintegration=False,
     if use_overintegration:
         quadrature_tag = DISCR_TAG_QUAD
     else:
-        quadrature_tag = None
+        quadrature_tag = DISCR_TAG_BASE
 
     if logmgr:
         logmgr_add_cl_device_info(logmgr, queue)

examples/poiseuille.py

@@ -30,7 +30,7 @@
 from meshmode.mesh import BTAG_ALL, BTAG_NONE  # noqa
 
 from grudge.shortcuts import make_visualizer
-from grudge.dof_desc import BoundaryDomainTag, DISCR_TAG_QUAD
+from grudge.dof_desc import BoundaryDomainTag, DISCR_TAG_BASE, DISCR_TAG_QUAD
 
 from mirgecom.discretization import create_discretization_collection
 from mirgecom.fluid import make_conserved
@@ -153,7 +153,7 @@ def main(actx_class, use_esdg=False, use_overintegration=False,
     if use_overintegration:
         quadrature_tag = DISCR_TAG_QUAD
     else:
-        quadrature_tag = None
+        quadrature_tag = DISCR_TAG_BASE
 
     if logmgr:
         logmgr_add_cl_device_info(logmgr, queue)

examples/scalar-advdiff.py

@@ -144,11 +144,11 @@ def main(actx_class, use_overintegration=False, use_esdg=False,
     dcoll = create_discretization_collection(actx, local_mesh, order=order)
     nodes = actx.thaw(dcoll.nodes())
 
-    from grudge.dof_desc import DISCR_TAG_QUAD
+    from grudge.dof_desc import DISCR_TAG_BASE, DISCR_TAG_QUAD
     if use_overintegration:
         quadrature_tag = DISCR_TAG_QUAD
     else:
-        quadrature_tag = None
+        quadrature_tag = DISCR_TAG_BASE
 
     def _limit_fluid_cv(cv, temperature_seed=None, gas_model=None, dd=None):
         actx = cv.array_context

examples/scalar-lump.py

@@ -28,7 +28,7 @@
 from functools import partial
 from pytools.obj_array import make_obj_array
 
-from grudge.dof_desc import DISCR_TAG_QUAD
+from grudge.dof_desc import DISCR_TAG_BASE, DISCR_TAG_QUAD
 from meshmode.mesh import BTAG_ALL, BTAG_NONE  # noqa
 from grudge.shortcuts import make_visualizer
 
@@ -141,7 +141,7 @@ def main(actx_class, use_leap=False, casename=None,
     if use_overintegration:
         quadrature_tag = DISCR_TAG_QUAD
     else:
-        quadrature_tag = None
+        quadrature_tag = DISCR_TAG_BASE
 
     vis_timer = None
 

examples/sod.py

@@ -143,11 +143,11 @@ def main(actx_class, use_overintegration=False, use_esdg=False,
     current_dt = actx.to_numpy(
         current_cfl * op.nodal_min(dcoll, "vol", nodal_h))[()]
 
-    from grudge.dof_desc import DISCR_TAG_QUAD
+    from grudge.dof_desc import DISCR_TAG_BASE, DISCR_TAG_QUAD
     if use_overintegration:
         quadrature_tag = DISCR_TAG_QUAD
     else:
-        quadrature_tag = None
+        quadrature_tag = DISCR_TAG_BASE
 
     vis_timer = None
 

examples/taylor-green.py

@@ -131,15 +131,14 @@ def main(actx_class, order=1, t_final=1, resolution=4,
                                                                     generate_mesh)
         local_nelements = local_mesh.nelements
 
-    from grudge.dof_desc import DISCR_TAG_QUAD
-
     dcoll = create_discretization_collection(actx, local_mesh, order=order)
     nodes = actx.thaw(dcoll.nodes())
 
+    from grudge.dof_desc import DISCR_TAG_BASE, DISCR_TAG_QUAD
     if use_overintegration:
         quadrature_tag = DISCR_TAG_QUAD
     else:
-        quadrature_tag = None
+        quadrature_tag = DISCR_TAG_BASE
 
     vis_timer = None
 

examples/vortex.py

@@ -139,11 +139,11 @@ def main(actx_class, use_overintegration=False, use_esdg=False,
     dcoll = create_discretization_collection(actx, local_mesh, order=order)
     nodes = actx.thaw(dcoll.nodes())
 
-    from grudge.dof_desc import DISCR_TAG_QUAD
+    from grudge.dof_desc import DISCR_TAG_BASE, DISCR_TAG_QUAD
     if use_overintegration:
         quadrature_tag = DISCR_TAG_QUAD
     else:
-        quadrature_tag = None
+        quadrature_tag = DISCR_TAG_BASE
 
     vis_timer = None