Fix some deprecations

examples/moving-geometry.py

@@ -245,7 +245,7 @@ def source(t, x):
 if __name__ == "__main__":
     cl_ctx = cl.create_some_context()
     queue = cl.CommandQueue(cl_ctx)
-    actx = PyOpenCLArrayContext(queue)
+    actx = PyOpenCLArrayContext(queue, force_device_scalars=True)
 
     from pytools import ProcessTimer
     for _ in range(1):

examples/plot-connectivity.py

@@ -11,7 +11,7 @@
 def main():
     cl_ctx = cl.create_some_context()
     queue = cl.CommandQueue(cl_ctx)
-    actx = PyOpenCLArrayContext(queue)
+    actx = PyOpenCLArrayContext(queue, force_device_scalars=True)
 
     from meshmode.mesh.generation import (  # noqa: F401
         generate_icosahedron,

examples/simple-dg.py

@@ -237,9 +237,7 @@ def face_jacobian(self, where):
     @memoize_method
     def get_inverse_mass_matrix(self, grp, dtype):
         import modepy as mp
-        matrix = mp.inverse_mass_matrix(
-                grp.basis_obj().functions,
-                grp.unit_nodes)
+        matrix = mp.inverse_mass_matrix(grp.basis_obj(), grp.unit_nodes)
 
         actx = self._setup_actx
         return actx.freeze(actx.from_numpy(matrix))
@@ -441,7 +439,9 @@ def bump(actx, discr, t=0):
             / source_width**2))
 
 
-@with_container_arithmetic(bcast_obj_array=True, rel_comparison=True)
+@with_container_arithmetic(bcast_obj_array=True,
+                           rel_comparison=True,
+                           _cls_has_array_context_attr=True)
 @dataclass_array_container
 @dataclass(frozen=True)
 class WaveState:

meshmode/discretization/poly_element.py

@@ -126,7 +126,7 @@ def mass_matrix(grp: InterpolatoryElementGroupBase) -> np.ndarray:
 
     assert grp.is_orthonormal_basis()
     return mp.mass_matrix(
-            grp.basis_obj().functions,
+            grp.basis_obj(),
             grp.unit_nodes)
 
 
@@ -288,13 +288,18 @@ def quadrature_rule(self):
 class _MassMatrixQuadratureElementGroup(PolynomialSimplexElementGroupBase):
     @memoize_method
     def quadrature_rule(self):
-        basis_fcts = self.basis_obj().functions
+        basis = self.basis_obj()
         nodes = self._interp_nodes
-        mass_matrix = mp.mass_matrix(basis_fcts, nodes)
+        mass_matrix = mp.mass_matrix(basis, nodes)
         weights = np.dot(mass_matrix,
-                         np.ones(len(basis_fcts)))
+                         np.ones(len(basis.functions)))
         return mp.Quadrature(nodes, weights, exact_to=self.order)
 
+    @property
+    @memoize_method
+    def unit_nodes(self):
+        return self._interp_nodes
+
     @property
     @abstractmethod
     def _interp_nodes(self):
@@ -571,11 +576,11 @@ def basis_obj(self):
 
     @memoize_method
     def quadrature_rule(self):
-        basis_fcts = self._basis.functions
+        basis = self._basis
         nodes = self._nodes
-        mass_matrix = mp.mass_matrix(basis_fcts, nodes)
+        mass_matrix = mp.mass_matrix(basis, nodes)
         weights = np.dot(mass_matrix,
-                         np.ones(len(basis_fcts)))
+                         np.ones(len(basis.functions)))
         return mp.Quadrature(nodes, weights, exact_to=self.order)
 
     @property

meshmode/mesh/processing.py

@@ -1646,8 +1646,7 @@ def not_none(vi: Optional[np.ndarray]) -> np.ndarray:
     new_vertex_indices = np.cumsum(used_flags, dtype=mesh.vertex_id_dtype) - 1
     new_vertex_indices[~used_flags] = -1
 
-    return replace(
-        mesh,
+    return mesh.copy(
         vertices=mesh.vertices[:, used_flags],
         groups=tuple(
             replace(grp, vertex_indices=new_vertex_indices[grp.vertex_indices])

test/test_array.py

@@ -28,6 +28,7 @@
 
 from arraycontext import (
     dataclass_array_container,
+    flatten,
     pytest_generate_tests_for_array_contexts,
     with_container_arithmetic,
 )
@@ -142,33 +143,31 @@ def _get_test_containers(actx, ambient_dim=2):
 @pytest.mark.parametrize("ord", [2, np.inf])
 def test_container_norm(actx_factory, ord):
     actx = actx_factory()
-
     c_test = _get_test_containers(actx)
 
-    # {{{ actx.np.linalg.norm
+    # {{{ flat_norm
 
     from pytools.obj_array import make_obj_array
     c = MyContainer(name="hey", mass=1, momentum=make_obj_array([2, 3]), enthalpy=5)
     c_obj_ary = make_obj_array([c, c])
 
-    n1 = actx.np.linalg.norm(c_obj_ary, ord)
+    n1 = flat_norm(c_obj_ary, ord)
     n2 = np.linalg.norm([1, 2, 3, 5]*2, ord)
     assert abs(n1 - n2) < 1e-12
 
-    # }}}
-
-    # {{{ flat_norm
-
-    # check nested vs actx.np.linalg.norm
-    assert actx.to_numpy(abs(
-            flat_norm(c_test[1], ord=ord)
-            - actx.np.linalg.norm(c_test[1], ord=ord))) < 1e-12
-
     # check nested container with only Numbers (and no actx)
     assert abs(flat_norm(c_obj_ary, ord=ord) - n2) < 1.0e-12
     assert abs(
             flat_norm(np.array([1, 1], dtype=object), ord=ord)
             - np.linalg.norm([1, 1], ord=ord)) < 1.0e-12
+
+    # check nested
+    n1 = actx.to_numpy(flat_norm(c_test[1], ord=ord))
+    n2 = np.linalg.norm([
+        np.linalg.norm(actx.to_numpy(flatten(ary, actx)), ord=ord) for ary in c_test[1]
+        ], ord=ord)
+    assert abs(n1 - n2) < 1e-12
+
     # }}}
 
 # }}}

test/test_mesh.py

@@ -267,8 +267,7 @@ def test_remove_unused_vertices():
 
     assert mesh.vertices is not None
 
-    mesh2 = replace(
-        mesh,
+    mesh2 = mesh.copy(
         vertices=np.concatenate([np.zeros((3, 1)), mesh.vertices], axis=1),
         groups=tuple(
             replace(

test/test_meshmode.py

@@ -889,7 +889,7 @@ def test_mesh_without_vertices(actx_factory):
     groups = [
         replace(grp, nodes=grp.nodes, vertex_indices=None)
         for grp in mesh.groups]
-    mesh = make_mesh(None, groups, is_conforming=False)
+    mesh = make_mesh(None, groups, is_conforming=None)
 
     # try refining it
     from meshmode.mesh.refinement import refine_uniformly