Multiple volumes

doc/conf.py

@@ -91,3 +91,8 @@
 rst_prolog = """
 .. |mirgecom| replace:: *MIRGE-Com*
 """
+
+# FIXME: Remove when grudge#280 gets merged
+nitpick_ignore_regex = [
+    ("py:class", r".*BoundaryDomainTag.*"),
+]

examples/autoignition-mpi.py

@@ -170,8 +170,7 @@ def main(actx_class, ctx_factory=cl.create_some_context, use_logmgr=True,
                                                                     generate_mesh)
         local_nelements = local_mesh.nelements
 
-    dcoll = create_discretization_collection(actx, local_mesh, order=order,
-                                             mpi_communicator=comm)
+    dcoll = create_discretization_collection(actx, local_mesh, order=order)
     nodes = actx.thaw(dcoll.nodes())
     ones = dcoll.zeros(actx) + 1.0
 
@@ -320,8 +319,7 @@ def get_fluid_state(cv, tseed):
         else:
             rst_cv = restart_data["cv"]
             old_dcoll = \
-                create_discretization_collection(actx, local_mesh, order=rst_order,
-                                                 mpi_communicator=comm)
+                create_discretization_collection(actx, local_mesh, order=rst_order)
             from meshmode.discretization.connection import make_same_mesh_connection
             connection = make_same_mesh_connection(actx, dcoll.discr_from_dd("vol"),
                                                    old_dcoll.discr_from_dd("vol"))

examples/doublemach-mpi.py

@@ -30,7 +30,7 @@
 from functools import partial
 
 from meshmode.mesh import BTAG_ALL, BTAG_NONE  # noqa
-from grudge.dof_desc import DTAG_BOUNDARY
+from grudge.dof_desc import BoundaryDomainTag
 from grudge.shortcuts import make_visualizer
 
 
@@ -192,8 +192,7 @@ def main(ctx_factory=cl.create_some_context, use_logmgr=True,
 
     from mirgecom.discretization import create_discretization_collection
     order = 3
-    dcoll = create_discretization_collection(actx, local_mesh, order=order,
-                                             mpi_communicator=comm)
+    dcoll = create_discretization_collection(actx, local_mesh, order=order)
     nodes = actx.thaw(dcoll.nodes())
 
     from grudge.dof_desc import DISCR_TAG_QUAD
@@ -237,22 +236,22 @@ def main(ctx_factory=cl.create_some_context, use_logmgr=True,
     eos = IdealSingleGas()
     gas_model = GasModel(eos=eos, transport=transport_model)
 
-    def _boundary_state(dcoll, btag, gas_model, state_minus, **kwargs):
+    def _boundary_state(dcoll, dd_bdry, gas_model, state_minus, **kwargs):
         actx = state_minus.array_context
-        bnd_discr = dcoll.discr_from_dd(btag)
+        bnd_discr = dcoll.discr_from_dd(dd_bdry)
         nodes = actx.thaw(bnd_discr.nodes())
         return make_fluid_state(initializer(x_vec=nodes, eos=gas_model.eos,
                                             **kwargs), gas_model)
 
     boundaries = {
-        DTAG_BOUNDARY("ic1"):
-        PrescribedFluidBoundary(boundary_state_func=_boundary_state),
-        DTAG_BOUNDARY("ic2"):
-        PrescribedFluidBoundary(boundary_state_func=_boundary_state),
-        DTAG_BOUNDARY("ic3"):
-        PrescribedFluidBoundary(boundary_state_func=_boundary_state),
-        DTAG_BOUNDARY("wall"): AdiabaticNoslipMovingBoundary(),
-        DTAG_BOUNDARY("out"): AdiabaticNoslipMovingBoundary(),
+        BoundaryDomainTag("ic1"):
+            PrescribedFluidBoundary(boundary_state_func=_boundary_state),
+        BoundaryDomainTag("ic2"):
+            PrescribedFluidBoundary(boundary_state_func=_boundary_state),
+        BoundaryDomainTag("ic3"):
+            PrescribedFluidBoundary(boundary_state_func=_boundary_state),
+        BoundaryDomainTag("wall"): AdiabaticNoslipMovingBoundary(),
+        BoundaryDomainTag("out"): AdiabaticNoslipMovingBoundary(),
     }
 
     if rst_filename:

examples/heat-source-mpi.py

@@ -30,7 +30,7 @@
 from meshmode.mesh import BTAG_ALL, BTAG_NONE  # noqa
 import grudge.op as op
 from grudge.shortcuts import make_visualizer
-from grudge.dof_desc import DTAG_BOUNDARY
+from grudge.dof_desc import BoundaryDomainTag
 from mirgecom.discretization import create_discretization_collection
 from mirgecom.integrators import rk4_step
 from mirgecom.diffusion import (
@@ -111,8 +111,7 @@ def main(actx_class, ctx_factory=cl.create_some_context, use_logmgr=True,
 
     order = 3
 
-    dcoll = create_discretization_collection(actx, local_mesh, order=order,
-                    mpi_communicator=comm)
+    dcoll = create_discretization_collection(actx, local_mesh, order=order)
 
     if dim == 2:
         # no deep meaning here, just a fudge factor
@@ -125,8 +124,8 @@ def main(actx_class, ctx_factory=cl.create_some_context, use_logmgr=True,
     nodes = actx.thaw(dcoll.nodes())
 
     boundaries = {
-        DTAG_BOUNDARY("dirichlet"): DirichletDiffusionBoundary(0.),
-        DTAG_BOUNDARY("neumann"): NeumannDiffusionBoundary(0.)
+        BoundaryDomainTag("dirichlet"): DirichletDiffusionBoundary(0.),
+        BoundaryDomainTag("neumann"): NeumannDiffusionBoundary(0.)
     }
 
     u = dcoll.zeros(actx)

examples/hotplate-mpi.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 DTAG_BOUNDARY
+from grudge.dof_desc import BoundaryDomainTag
 
 from mirgecom.discretization import create_discretization_collection
 from mirgecom.fluid import make_conserved
@@ -168,9 +168,7 @@ def main(ctx_factory=cl.create_some_context, use_logmgr=True,
         local_nelements = local_mesh.nelements
 
     order = 1
-    dcoll = create_discretization_collection(
-        actx, local_mesh, order=order, mpi_communicator=comm
-    )
+    dcoll = create_discretization_collection(actx, local_mesh, order=order)
     nodes = actx.thaw(dcoll.nodes())
 
     if logmgr:
@@ -221,21 +219,22 @@ def tramp_2d(x_vec, eos, cv=None, **kwargs):
 
     exact = initializer(x_vec=nodes, eos=gas_model.eos)
 
-    def _boundary_state(dcoll, btag, gas_model, state_minus, **kwargs):
+    def _boundary_state(dcoll, dd_bdry, gas_model, state_minus, **kwargs):
         actx = state_minus.array_context
-        bnd_discr = dcoll.discr_from_dd(btag)
+        bnd_discr = dcoll.discr_from_dd(dd_bdry)
         nodes = actx.thaw(bnd_discr.nodes())
         return make_fluid_state(initializer(x_vec=nodes, eos=gas_model.eos,
                                             **kwargs), gas_model)
 
-    boundaries = {DTAG_BOUNDARY("-1"):
-                  PrescribedFluidBoundary(boundary_state_func=_boundary_state),
-                  DTAG_BOUNDARY("+1"):
-                  PrescribedFluidBoundary(boundary_state_func=_boundary_state),
-                  DTAG_BOUNDARY("-2"): IsothermalNoSlipBoundary(
-                      wall_temperature=bottom_boundary_temperature),
-                  DTAG_BOUNDARY("+2"): IsothermalNoSlipBoundary(
-                      wall_temperature=top_boundary_temperature)}
+    boundaries = {
+        BoundaryDomainTag("-1"): PrescribedFluidBoundary(
+            boundary_state_func=_boundary_state),
+        BoundaryDomainTag("+1"): PrescribedFluidBoundary(
+            boundary_state_func=_boundary_state),
+        BoundaryDomainTag("-2"): IsothermalNoSlipBoundary(
+            wall_temperature=bottom_boundary_temperature),
+        BoundaryDomainTag("+2"): IsothermalNoSlipBoundary(
+            wall_temperature=top_boundary_temperature)}
 
     if rst_filename:
         current_t = restart_data["t"]

examples/lump-mpi.py

@@ -146,9 +146,7 @@ def main(actx_class, ctx_factory=cl.create_some_context, use_logmgr=True,
         local_nelements = local_mesh.nelements
 
     order = 3
-    dcoll = create_discretization_collection(
-        actx, local_mesh, order=order, mpi_communicator=comm
-    )
+    dcoll = create_discretization_collection(actx, local_mesh, order=order)
     nodes = actx.thaw(dcoll.nodes())
 
     vis_timer = None
@@ -180,9 +178,9 @@ def main(actx_class, ctx_factory=cl.create_some_context, use_logmgr=True,
     from mirgecom.gas_model import GasModel, make_fluid_state
     gas_model = GasModel(eos=eos)
 
-    def boundary_solution(dcoll, btag, gas_model, state_minus, **kwargs):
+    def boundary_solution(dcoll, dd_bdry, gas_model, state_minus, **kwargs):
         actx = state_minus.array_context
-        bnd_discr = dcoll.discr_from_dd(btag)
+        bnd_discr = dcoll.discr_from_dd(dd_bdry)
         nodes = actx.thaw(bnd_discr.nodes())
         return make_fluid_state(initializer(x_vec=nodes, eos=gas_model.eos,
                                             **kwargs), gas_model)

examples/mixture-mpi.py

@@ -146,9 +146,7 @@ def main(actx_class, ctx_factory=cl.create_some_context, use_logmgr=True,
         local_nelements = local_mesh.nelements
 
     order = 3
-    dcoll = create_discretization_collection(
-        actx, local_mesh, order=order, mpi_communicator=comm
-    )
+    dcoll = create_discretization_collection(actx, local_mesh, order=order)
     nodes = actx.thaw(dcoll.nodes())
 
     vis_timer = None
@@ -202,9 +200,9 @@ def main(actx_class, ctx_factory=cl.create_some_context, use_logmgr=True,
     initializer = MixtureInitializer(dim=dim, nspecies=nspecies,
                                      massfractions=y0s, velocity=velocity)
 
-    def boundary_solution(dcoll, btag, gas_model, state_minus, **kwargs):
+    def boundary_solution(dcoll, dd_bdry, gas_model, state_minus, **kwargs):
         actx = state_minus.array_context
-        bnd_discr = dcoll.discr_from_dd(btag)
+        bnd_discr = dcoll.discr_from_dd(dd_bdry)
         nodes = actx.thaw(bnd_discr.nodes())
         return make_fluid_state(initializer(x_vec=nodes, eos=gas_model.eos,
                                             **kwargs), gas_model,

examples/multiple-volumes-mpi-lazy.py

@@ -0,0 +1 @@
+multiple-volumes-mpi.py