make comm_tag a required parameter

examples/autoignition-mpi.py

@@ -74,6 +74,14 @@ class MyRuntimeError(RuntimeError):
     pass
 
 
+class FluidTag:
+    pass
+
+
+class FluidOpTag:
+    pass
+
+
 @mpi_entry_point
 def main(actx_class, ctx_factory=cl.create_some_context, use_logmgr=True,
          use_leap=False, use_overintegration=False, use_profiling=False,
@@ -612,11 +620,12 @@ def my_rhs(t, state):
                                        limiter_func=_limit_fluid_cv)
 
         fluid_operator_states = make_operator_fluid_states(
-            dcoll, fluid_state, gas_model, boundaries=boundaries,
+            dcoll, fluid_state, gas_model, boundaries=boundaries, comm_tag=FluidTag,
             quadrature_tag=quadrature_tag, limiter_func=_limit_fluid_cv)
 
         fluid_rhs = fluid_operator(
             dcoll, state=fluid_state, gas_model=gas_model, time=t,
+            comm_tag=FluidOpTag,
             boundaries=boundaries, operator_states_quad=fluid_operator_states,
             quadrature_tag=quadrature_tag,
             inviscid_numerical_flux_func=inv_num_flux_func)

examples/doublemach-mpi.py

@@ -71,6 +71,14 @@ class MyRuntimeError(RuntimeError):
     pass
 
 
+class EulerTag:
+    pass
+
+
+class AVLaplacianTag:
+    pass
+
+
 def get_doublemach_mesh():
     """Generate or import a grid using `gmsh`.
 
@@ -405,9 +413,10 @@ def my_rhs(t, state):
         fluid_state = make_fluid_state(state, gas_model)
         return (
             euler_operator(dcoll, state=fluid_state, time=t,
-                           boundaries=boundaries,
+                           boundaries=boundaries, comm_tag=EulerTag,
                            gas_model=gas_model, quadrature_tag=quadrature_tag)
-            + av_laplacian_operator(dcoll, fluid_state=fluid_state,
+            + av_laplacian_operator(dcoll, comm_tag=AVLaplacianTag,
+                                    fluid_state=fluid_state,
                                     boundaries=boundaries,
                                     time=t, gas_model=gas_model,
                                     alpha=alpha, s0=s0, kappa=kappa,

examples/heat-source-mpi.py

@@ -47,6 +47,10 @@
 from logpyle import IntervalTimer, set_dt
 
 
+class DiffusionTag:
+    pass
+
+
 @mpi_entry_point
 def main(actx_class, ctx_factory=cl.create_some_context, use_logmgr=True,
          use_leap=False, use_profiling=False, casename=None, lazy=False,
@@ -151,7 +155,8 @@ def main(actx_class, ctx_factory=cl.create_some_context, use_logmgr=True,
 
     def rhs(t, u):
         return (
-            diffusion_operator(dcoll, kappa=1, boundaries=boundaries, u=u)
+            diffusion_operator(dcoll, comm_tag=DiffusionTag,
+                               kappa=1, boundaries=boundaries, u=u)
             + actx.np.exp(-np.dot(nodes, nodes)/source_width**2))
 
     compiled_rhs = actx.compile(rhs)

examples/hotplate-mpi.py

@@ -69,6 +69,10 @@ class MyRuntimeError(RuntimeError):
     pass
 
 
+class NSTag:
+    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"]
@@ -409,8 +413,8 @@ def my_post_step(step, t, dt, state):
 
     def my_rhs(t, state):
         fluid_state = make_fluid_state(state, gas_model)
-        return ns_operator(dcoll, boundaries=boundaries, state=fluid_state,
-                           time=t, gas_model=gas_model)
+        return ns_operator(dcoll, comm_tag=NSTag, boundaries=boundaries,
+                           state=fluid_state, time=t, gas_model=gas_model)
 
     current_dt = get_sim_timestep(dcoll, current_state, current_t, current_dt,
                                   current_cfl, t_final, constant_cfl)

examples/lump-mpi.py

@@ -65,6 +65,10 @@ class MyRuntimeError(RuntimeError):
     pass
 
 
+class EulerTag:
+    pass
+
+
 @mpi_entry_point
 def main(actx_class, ctx_factory=cl.create_some_context, use_logmgr=True,
          use_leap=False, use_profiling=False, casename=None, lazy=False,
@@ -330,7 +334,7 @@ def my_post_step(step, t, dt, state):
 
     def my_rhs(t, state):
         fluid_state = make_fluid_state(state, gas_model)
-        return euler_operator(dcoll, state=fluid_state, time=t,
+        return euler_operator(dcoll, comm_tag=EulerTag, state=fluid_state, time=t,
                               boundaries=boundaries, gas_model=gas_model)
 
     current_dt = get_sim_timestep(dcoll, current_state, current_t, current_dt,

examples/mixture-mpi.py

@@ -67,6 +67,10 @@ class MyRuntimeError(RuntimeError):
     pass
 
 
+class EulerTag:
+    pass
+
+
 @mpi_entry_point
 def main(actx_class, ctx_factory=cl.create_some_context, use_logmgr=True,
          use_leap=False, use_profiling=False, casename=None, rst_filename=None,
@@ -382,7 +386,7 @@ def my_rhs(t, state):
         cv, tseed = state
         fluid_state = make_fluid_state(cv, gas_model, temperature_seed=tseed)
         return make_obj_array(
-            [euler_operator(dcoll, state=fluid_state, time=t,
+            [euler_operator(dcoll, comm_tag=EulerTag, state=fluid_state, time=t,
                             boundaries=boundaries, gas_model=gas_model),
              0*tseed])
 

examples/nsmix-mpi.py

@@ -73,6 +73,10 @@ class MyRuntimeError(RuntimeError):
     pass
 
 
+class NSTag:
+    pass
+
+
 @mpi_entry_point
 def main(ctx_factory=cl.create_some_context, use_logmgr=True,
          use_leap=False, use_profiling=False, casename=None,
@@ -485,7 +489,7 @@ def my_rhs(t, state):
         cv, tseed = state
         fluid_state = make_fluid_state(cv=cv, gas_model=gas_model,
                                        temperature_seed=tseed)
-        ns_rhs = ns_operator(dcoll, state=fluid_state, time=t,
+        ns_rhs = ns_operator(dcoll, comm_tag=NSTag, state=fluid_state, time=t,
                              boundaries=visc_bnds, gas_model=gas_model)
         cv_rhs = ns_rhs + eos.get_species_source_terms(cv, fluid_state.temperature)
         return make_obj_array([cv_rhs, 0*tseed])

examples/poiseuille-local_dt-mpi.py

@@ -71,6 +71,10 @@ class MyRuntimeError(RuntimeError):
     pass
 
 
+class NSTag:
+    pass
+
+
 @mpi_entry_point
 def main(ctx_factory=cl.create_some_context, use_logmgr=True,
          use_overintegration=False, lazy=False,
@@ -432,7 +436,8 @@ def my_post_step(step, t, dt, state):
 
     def my_rhs(t, state):
         fluid_state = make_fluid_state(state, gas_model)
-        return ns_operator(dcoll, gas_model=gas_model, boundaries=boundaries,
+        return ns_operator(dcoll, comm_tag=NSTag, gas_model=gas_model,
+                           boundaries=boundaries,
                            state=fluid_state, time=t,
                            quadrature_tag=quadrature_tag)
 

examples/poiseuille-mpi.py

@@ -70,6 +70,10 @@ class MyRuntimeError(RuntimeError):
     pass
 
 
+class NSTag:
+    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"]
@@ -419,7 +423,8 @@ def my_post_step(step, t, dt, state):
 
     def my_rhs(t, state):
         fluid_state = make_fluid_state(state, gas_model)
-        return ns_operator(dcoll, gas_model=gas_model, boundaries=boundaries,
+        return ns_operator(dcoll, comm_tag=NSTag, gas_model=gas_model,
+                           boundaries=boundaries,
                            state=fluid_state, time=t,
                            quadrature_tag=quadrature_tag)
 

examples/pulse-mpi.py

@@ -73,6 +73,10 @@ class MyRuntimeError(RuntimeError):
     pass
 
 
+class EulerTag:
+    pass
+
+
 @mpi_entry_point
 def main(actx_class, ctx_factory=cl.create_some_context, use_logmgr=True,
          use_overintegration=False, lazy=False, use_leap=False, use_profiling=False,
@@ -303,7 +307,8 @@ def my_rhs(t, state):
         return euler_operator(dcoll, state=fluid_state, time=t,
                               boundaries=boundaries,
                               gas_model=gas_model,
-                              quadrature_tag=quadrature_tag)
+                              quadrature_tag=quadrature_tag,
+                              comm_tag=EulerTag)
 
     current_dt = get_sim_timestep(dcoll, current_state, current_t, current_dt,
                                   current_cfl, t_final, constant_cfl)

examples/scalar-lump-mpi.py

@@ -66,6 +66,10 @@ class MyRuntimeError(RuntimeError):
     pass
 
 
+class EulerTag:
+    pass
+
+
 @mpi_entry_point
 def main(actx_class, ctx_factory=cl.create_some_context, use_logmgr=True,
          use_leap=False, use_profiling=False, casename=None,
@@ -341,7 +345,7 @@ def my_post_step(step, t, dt, state):
 
     def my_rhs(t, state):
         fluid_state = make_fluid_state(state, gas_model)
-        return euler_operator(dcoll, state=fluid_state, time=t,
+        return euler_operator(dcoll, comm_tag=EulerTag, state=fluid_state, time=t,
                               boundaries=boundaries, gas_model=gas_model)
 
     current_dt = get_sim_timestep(dcoll, current_state, current_t, current_dt,

examples/sod-mpi.py

@@ -65,6 +65,10 @@ class MyRuntimeError(RuntimeError):
     pass
 
 
+class EulerTag:
+    pass
+
+
 @mpi_entry_point
 def main(actx_class, ctx_factory=cl.create_some_context, use_logmgr=True,
          use_leap=False, use_profiling=False, casename=None, lazy=False,
@@ -331,7 +335,7 @@ def my_post_step(step, t, dt, state):
 
     def my_rhs(t, state):
         fluid_state = make_fluid_state(cv=state, gas_model=gas_model)
-        return euler_operator(dcoll, state=fluid_state, time=t,
+        return euler_operator(dcoll, comm_tag=EulerTag, state=fluid_state, time=t,
                               boundaries=boundaries, gas_model=gas_model)
 
     current_dt = get_sim_timestep(dcoll, current_state, current_t, current_dt,

examples/vortex-mpi.py

@@ -67,6 +67,10 @@ class MyRuntimeError(RuntimeError):
     pass
 
 
+class EulerTag:
+    pass
+
+
 @mpi_entry_point
 def main(actx_class, ctx_factory=cl.create_some_context, use_logmgr=True,
          use_leap=False, use_profiling=False, casename=None, lazy=False,
@@ -357,7 +361,8 @@ def my_post_step(step, t, dt, state):
     def my_rhs(t, state):
         fluid_state = make_fluid_state(state, gas_model)
         return euler_operator(dcoll, state=fluid_state, time=t,
-                              boundaries=boundaries, gas_model=gas_model)
+                              boundaries=boundaries, gas_model=gas_model,
+                              comm_tag=EulerTag)
 
     current_dt = get_sim_timestep(dcoll, current_state, current_t, current_dt,
                                   current_cfl, t_final, constant_cfl)

examples/wave-mpi.py

@@ -47,6 +47,10 @@
                                          logmgr_add_device_memory_usage)
 
 
+class WaveTag:
+    pass
+
+
 def bump(actx, nodes, t=0):
     """Create a bump."""
     dim = len(nodes)
@@ -187,7 +191,7 @@ def main(actx_class, snapshot_pattern="wave-mpi-{step:04d}-{rank:04d}.pkl",
     vis = make_visualizer(dcoll)
 
     def rhs(t, w):
-        return wave_operator(dcoll, c=wave_speed, w=w)
+        return wave_operator(dcoll, c=wave_speed, w=w, comm_tag=WaveTag)
     fields = force_evaluation(actx, fields)
     compiled_rhs = actx.compile(rhs)
 

examples/wave.py

@@ -46,6 +46,10 @@
                                          logmgr_add_device_memory_usage)
 
 
+class WaveTag:
+    pass
+
+
 def bump(actx, nodes, t=0):
     """Create a bump."""
     dim = len(nodes)
@@ -138,7 +142,7 @@ def main(actx_class, use_profiling=False, use_logmgr=False, lazy: bool = False):
     vis = make_visualizer(dcoll)
 
     def rhs(t, w):
-        return wave_operator(dcoll, c=wave_speed, w=w)
+        return wave_operator(dcoll, c=wave_speed, w=w, comm_tag=WaveTag)
 
     compiled_rhs = actx.compile(rhs)
     fields = force_evaluation(actx, fields)

mirgecom/artificial_viscosity.py

@@ -156,10 +156,11 @@ class _AVRTag:
     pass
 
 
-def av_laplacian_operator(dcoll, boundaries, fluid_state, alpha, gas_model=None,
+def av_laplacian_operator(dcoll, boundaries, fluid_state, alpha, comm_tag,
+                          gas_model=None,
                           kappa=1., s0=-6., time=0, quadrature_tag=DISCR_TAG_BASE,
                           dd=DD_VOLUME_ALL, boundary_kwargs=None, indicator=None,
-                          divergence_numerical_flux=num_flux_central, comm_tag=None,
+                          divergence_numerical_flux=num_flux_central,
                           operator_states_quad=None,
                           grad_cv=None,
                           **kwargs):
@@ -182,6 +183,9 @@ def av_laplacian_operator(dcoll, boundaries, fluid_state, alpha, gas_model=None,
     alpha: float
         The maximum artificial viscosity coefficient to be applied
 
+    comm_tag: Hashable
+        Tag for distributed communication
+
     indicator: :class:`~meshmode.dof_array.DOFArray`
         The indicator field used for locating where AV should be applied. If not
         supplied by the user, then
@@ -206,16 +210,11 @@ def av_laplacian_operator(dcoll, boundaries, fluid_state, alpha, gas_model=None,
         the DOF descriptor of the discretization on which *fluid_state* lives.
         Must be a volume on the base discretization.
 
-    comm_tag: Hashable
-        Tag for distributed communication
-
     Returns
     -------
     :class:`mirgecom.fluid.ConservedVars`
         The artificial viscosity operator applied to *q*.
     """
-    assert comm_tag is not None, "comm_tag can not be 'None'"
-
     boundaries = normalize_boundaries(boundaries)
 
     cv = fluid_state.cv
@@ -248,8 +247,8 @@ def interp_to_vol_quad(u):
     if operator_states_quad is None:
         from mirgecom.gas_model import make_operator_fluid_states
         operator_states_quad = make_operator_fluid_states(
-            dcoll, fluid_state, gas_model, boundaries, quadrature_tag,
-            dd=dd_vol, comm_tag=comm_tag)
+            dcoll, fluid_state, gas_model, boundaries, comm_tag, quadrature_tag,
+            dd=dd_vol)
 
     vol_state_quad, inter_elem_bnd_states_quad, domain_bnd_states_quad = \
         operator_states_quad

mirgecom/diffusion.py

@@ -309,8 +309,8 @@ def boundary_flux(bdtag, bdry):
 
 
 def diffusion_operator(
-        dcoll, kappa, boundaries, u, *, return_grad_u=False,
-        quadrature_tag=DISCR_TAG_BASE, dd=DD_VOLUME_ALL, comm_tag=None,
+        dcoll, kappa, boundaries, u, *, comm_tag, return_grad_u=False,
+        quadrature_tag=DISCR_TAG_BASE, dd=DD_VOLUME_ALL,
         # Added to avoid repeated computation
         # FIXME: See if there's a better way to do this
         grad_u=None):
@@ -353,8 +353,6 @@ def diffusion_operator(
     grad_u: numpy.ndarray
         the gradient of *u*; only returned if *return_grad_u* is True
     """
-    assert comm_tag is not None, "comm_tag can not be 'None'"
-
     if isinstance(u, np.ndarray):
         if not isinstance(boundaries, list):
             raise TypeError("boundaries must be a list if u is an object array")