Refactor DiscretizationCollection constructor

examples/advection/surface.py

@@ -158,9 +158,9 @@ def main(ctx_factory, dim=2, order=4, use_quad=False, visualize=False):
         discr_tag_to_group_factory[qtag] = \
             QuadratureSimplexGroupFactory(order=4*order)
 
-    from grudge import DiscretizationCollection
+    from grudge import make_discretization_collection
 
-    dcoll = DiscretizationCollection(
+    dcoll = make_discretization_collection(
         actx, mesh,
         discr_tag_to_group_factory=discr_tag_to_group_factory
     )

examples/advection/var-velocity.py

@@ -146,9 +146,9 @@ def main(ctx_factory, dim=2, order=4, use_quad=False, visualize=False):
     else:
         discr_tag_to_group_factory = {}
 
-    from grudge import DiscretizationCollection
+    from grudge import make_discretization_collection
 
-    dcoll = DiscretizationCollection(
+    dcoll = make_discretization_collection(
         actx, mesh, order=order,
         discr_tag_to_group_factory=discr_tag_to_group_factory
     )

examples/advection/weak.py

@@ -134,9 +134,9 @@ def main(ctx_factory, dim=2, order=4, visualize=False):
             [np.linspace(-d/2, d/2, npoints) for _ in range(dim)],
             order=order)
 
-    from grudge import DiscretizationCollection
+    from grudge import make_discretization_collection
 
-    dcoll = DiscretizationCollection(actx, mesh, order=order)
+    dcoll = make_discretization_collection(actx, mesh, order=order)
 
     # }}}
 

examples/geometry.py

@@ -33,7 +33,7 @@
 from arraycontext import thaw
 from grudge.array_context import PyOpenCLArrayContext
 
-from grudge import DiscretizationCollection, shortcuts
+from grudge import make_discretization_collection, shortcuts
 
 
 def main(write_output=True):
@@ -49,7 +49,7 @@ def main(write_output=True):
     from meshmode.mesh.generation import generate_warped_rect_mesh
     mesh = generate_warped_rect_mesh(dim=2, order=4, nelements_side=6)
 
-    dcoll = DiscretizationCollection(actx, mesh, order=4)
+    dcoll = make_discretization_collection(actx, mesh, order=4)
 
     nodes = thaw(dcoll.nodes(), actx)
     bdry_nodes = thaw(dcoll.nodes(dd=BTAG_ALL), actx)

examples/hello-grudge.py

@@ -10,7 +10,7 @@
 # BEGINEXAMPLE
 import numpy as np
 import pyopencl as cl
-from grudge.discretization import DiscretizationCollection
+from grudge.discretization import make_discretization_collection
 import grudge.op as op
 from meshmode.mesh.generation import generate_box_mesh
 from meshmode.array_context import PyOpenCLArrayContext
@@ -27,7 +27,7 @@
 mesh = generate_box_mesh((coords,),
                          boundary_tag_to_face={"left": ["-x"],
                                                "right": ["+x"]})
-dcoll = DiscretizationCollection(actx, mesh, order=1)
+dcoll = make_discretization_collection(actx, mesh, order=1)
 
 
 def initial_condition(x):

examples/maxwell/cavities.py

@@ -34,7 +34,7 @@
 from grudge.array_context import PyOpenCLArrayContext
 
 from grudge.shortcuts import set_up_rk4
-from grudge import DiscretizationCollection
+from grudge import make_discretization_collection
 
 from grudge.models.em import get_rectangular_cavity_mode
 
@@ -59,7 +59,7 @@ def main(ctx_factory, dim=3, order=4, visualize=False):
             b=(1.0,)*dim,
             nelements_per_axis=(4,)*dim)
 
-    dcoll = DiscretizationCollection(actx, mesh, order=order)
+    dcoll = make_discretization_collection(actx, mesh, order=order)
 
     if 0:
         epsilon0 = 8.8541878176e-12  # C**2 / (N m**2)

examples/old_symbolics/dagrt-fusion.py

@@ -77,7 +77,7 @@
 from pytools import memoize
 from pytools.obj_array import flat_obj_array
 
-from grudge import sym, bind, DiscretizationCollection
+from grudge import sym, bind, make_discretization_collection
 from leap.rk import LSRK4MethodBuilder
 
 from pyopencl.tools import (  # noqa
@@ -573,7 +573,7 @@ def get_wave_op_with_discr(actx, dims=2, order=4):
 
     logger.debug("%d elements", mesh.nelements)
 
-    discr = DiscretizationCollection(actx, mesh, order=order)
+    discr = make_discretization_collection(actx, mesh, order=order)
 
     from symbolic_wave_op import WeakWaveOperator
     from meshmode.mesh import BTAG_ALL, BTAG_NONE

examples/wave/var-propagation-speed.py

@@ -34,7 +34,7 @@
 from grudge.array_context import PyOpenCLArrayContext
 
 from grudge.shortcuts import set_up_rk4
-from grudge import DiscretizationCollection
+from grudge import make_discretization_collection
 
 from pytools.obj_array import flat_obj_array
 
@@ -59,7 +59,7 @@ def main(ctx_factory, dim=2, order=4, visualize=False):
             b=(0.5,)*dim,
             nelements_per_axis=(20,)*dim)
 
-    dcoll = DiscretizationCollection(actx, mesh, order=order)
+    dcoll = make_discretization_collection(actx, mesh, order=order)
 
     def source_f(actx, dcoll, t=0):
         source_center = np.array([0.1, 0.22, 0.33])[:dcoll.dim]

examples/wave/wave-min-mpi.py

@@ -34,7 +34,7 @@
 from grudge.array_context import PyOpenCLArrayContext
 
 from grudge.shortcuts import set_up_rk4
-from grudge import DiscretizationCollection
+from grudge import make_discretization_collection
 
 from mpi4py import MPI
 
@@ -79,8 +79,10 @@ def main(ctx_factory, dim=2, order=4, visualize=False):
     else:
         local_mesh = mesh_dist.receive_mesh_part()
 
-    dcoll = DiscretizationCollection(actx, local_mesh, order=order,
-            mpi_communicator=comm)
+    dcoll = make_discretization_collection(
+        actx, local_mesh, order=order,
+        mpi_communicator=comm
+    )
 
     def source_f(actx, dcoll, t=0):
         source_center = np.array([0.1, 0.22, 0.33])[:dcoll.dim]

examples/wave/wave-op-mpi.py

@@ -38,7 +38,7 @@
 
 from meshmode.mesh import BTAG_ALL, BTAG_NONE  # noqa
 
-from grudge.discretization import DiscretizationCollection
+from grudge.discretization import make_discretization_collection
 from grudge.shortcuts import make_visualizer
 
 import grudge.op as op
@@ -176,8 +176,10 @@ def main(ctx_factory, dim=2, order=3, visualize=False):
     else:
         local_mesh = mesh_dist.receive_mesh_part()
 
-    dcoll = DiscretizationCollection(actx, local_mesh, order=order,
-                    mpi_communicator=comm)
+    dcoll = make_discretization_collection(
+        actx, local_mesh, order=order,
+        mpi_communicator=comm
+    )
 
     fields = flat_obj_array(
             bump(actx, dcoll),

examples/wave/wave-op-var-velocity.py

@@ -38,7 +38,7 @@
 
 from meshmode.mesh import BTAG_ALL, BTAG_NONE  # noqa
 
-from grudge.discretization import DiscretizationCollection
+from grudge.discretization import make_discretization_collection
 from grudge.dof_desc import DISCR_TAG_BASE, DISCR_TAG_QUAD, DOFDesc
 from grudge.shortcuts import make_visualizer
 
@@ -179,7 +179,7 @@ def main(ctx_factory, dim=2, order=3, visualize=False):
     from meshmode.discretization.poly_element import \
             QuadratureSimplexGroupFactory, \
             default_simplex_group_factory
-    dcoll = DiscretizationCollection(
+    dcoll = make_discretization_collection(
         actx, mesh,
         discr_tag_to_group_factory={
             DISCR_TAG_BASE: default_simplex_group_factory(base_dim=dim, order=order),

grudge/__init__.py

@@ -1,4 +1,7 @@
-__copyright__ = "Copyright (C) 2015 Andreas Kloeckner"
+__copyright__ = """
+Copyright (C) 2015 Andreas Kloeckner
+Copyright (C) 2021 University of Illinois Board of Trustees
+"""
 
 __license__ = """
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -23,8 +26,13 @@
 import grudge.symbolic as sym
 from grudge.execution import bind
 
-from grudge.discretization import DiscretizationCollection
+from grudge.discretization import (
+    DiscretizationCollection,
+    make_discretization_collection
+)
 
 __all__ = [
-    "sym", "bind", "DiscretizationCollection"
+    "sym", "bind",
+    "DiscretizationCollection",
+    "make_discretization_collection"
 ]