Multi-volume extras

grudge/dof_desc.py

@@ -8,8 +8,6 @@
 :mod:`grudge`-specific boundary tags
 ------------------------------------
 
-.. autoclass:: BTAG_MULTIVOL_PARTITION
-
 Domain tags
 -----------
 
@@ -111,24 +109,6 @@ class VTAG_ALL:  # noqa: N801
 # }}}
 
 
-# {{{ partition identifier
-
-@dataclass(init=True, eq=True, frozen=True)
-class BTAG_MULTIVOL_PARTITION:  # noqa: N801
-    """
-    .. attribute:: other_rank
-
-        An integer, or *None*. If *None*, this marks a partition boundary
-        to another volume on the same rank.
-
-    .. attribute:: other_volume_tag
-    """
-    other_rank: Optional[int]
-    other_volume_tag: "VolumeTag"
-
-# }}}
-
-
 # {{{ domain tag
 
 @dataclass(frozen=True, eq=True)
@@ -401,17 +381,17 @@ def _normalize_domain_and_discr_tag(
     if _contextual_volume_tag is None:
         _contextual_volume_tag = VTAG_ALL
 
-    if domain in [DTAG_SCALAR, "scalar"]:
+    if domain == "scalar":
         domain = DTAG_SCALAR
-    elif isinstance(domain, (BoundaryDomainTag, VolumeDomainTag)):
+    elif isinstance(domain, (ScalarDomainTag, BoundaryDomainTag, VolumeDomainTag)):
         pass
-    elif domain == "vol":
+    elif domain in [VTAG_ALL, "vol"]:
         domain = DTAG_VOLUME_ALL
     elif domain in [FACE_RESTR_ALL, "all_faces"]:
-        domain = BoundaryDomainTag(FACE_RESTR_ALL)
+        domain = BoundaryDomainTag(FACE_RESTR_ALL, _contextual_volume_tag)
     elif domain in [FACE_RESTR_INTERIOR, "int_faces"]:
-        domain = BoundaryDomainTag(FACE_RESTR_INTERIOR)
-    elif isinstance(domain, (BTAG_PARTITION, BTAG_MULTIVOL_PARTITION)):
+        domain = BoundaryDomainTag(FACE_RESTR_INTERIOR, _contextual_volume_tag)
+    elif isinstance(domain, BTAG_PARTITION):
         domain = BoundaryDomainTag(domain, _contextual_volume_tag)
     elif domain in [BTAG_ALL, BTAG_REALLY_ALL, BTAG_NONE]:
         domain = BoundaryDomainTag(domain, _contextual_volume_tag)

grudge/dt_utils.py

@@ -82,7 +82,7 @@ def characteristic_lengthscales(
     node distance on the reference cell (see :func:`dt_non_geometric_factors`),
     and :math:`r_D` is the inradius of the cell (see :func:`dt_geometric_factors`).
 
-    :returns: a frozen :class:`~meshmode.dof_array.DOFArray` containing a
+    :returns: a :class:`~meshmode.dof_array.DOFArray` containing a
         characteristic lengthscale for each element, at each nodal location.
 
     .. note::
@@ -94,7 +94,7 @@ def characteristic_lengthscales(
         methods has been used as a guide. Any concrete time integrator will
         likely require scaling of the values returned by this routine.
     """
-    @memoize_in(dcoll, (characteristic_lengthscales,
+    @memoize_in(dcoll, (characteristic_lengthscales, dd,
                         "compute_characteristic_lengthscales"))
     def _compute_characteristic_lengthscales():
         return actx.freeze(

grudge/eager.py

@@ -47,14 +47,14 @@ def __init__(self, *args, **kwargs):
     def project(self, src, tgt, vec):
         return op.project(self, src, tgt, vec)
 
-    def grad(self, vec):
-        return op.local_grad(self, vec)
+    def grad(self, *args):
+        return op.local_grad(self, *args)
 
-    def d_dx(self, xyz_axis, vec):
-        return op.local_d_dx(self, xyz_axis, vec)
+    def d_dx(self, xyz_axis, *args):
+        return op.local_d_dx(self, xyz_axis, *args)
 
-    def div(self, vecs):
-        return op.local_div(self, vecs)
+    def div(self, *args):
+        return op.local_div(self, *args)
 
     def weak_grad(self, *args):
         return op.weak_local_grad(self, *args)
@@ -68,8 +68,8 @@ def weak_div(self, *args):
     def mass(self, *args):
         return op.mass(self, *args)
 
-    def inverse_mass(self, vec):
-        return op.inverse_mass(self, vec)
+    def inverse_mass(self, *args):
+        return op.inverse_mass(self, *args)
 
     def face_mass(self, *args):
         return op.face_mass(self, *args)
@@ -89,5 +89,6 @@ def nodal_max(self, dd, vec):
 
 interior_trace_pair = op.interior_trace_pair
 cross_rank_trace_pairs = op.cross_rank_trace_pairs
+inter_volume_trace_pairs = op.inter_volume_trace_pairs
 
 # vim: foldmethod=marker