From 976b791ebdcd5b6e32d44f07ca4589012493df68 Mon Sep 17 00:00:00 2001 From: Alexandru Fikl Date: Thu, 11 Jul 2024 11:02:22 +0300 Subject: [PATCH] test: use make_discretization_collection --- examples/advection/surface.py | 4 ++-- examples/advection/var-velocity.py | 4 ++-- examples/advection/weak.py | 4 ++-- examples/euler/acoustic_pulse.py | 4 ++-- examples/euler/vortex.py | 4 ++-- examples/geometry.py | 11 +++++----- examples/maxwell/cavities.py | 6 +++--- examples/wave/var-propagation-speed.py | 6 +++--- examples/wave/wave-op-var-velocity.py | 4 ++-- test/test_dt_utils.py | 12 +++++------ test/test_euler_model.py | 4 ++-- test/test_grudge.py | 28 +++++++++++++------------- test/test_metrics.py | 4 ++-- test/test_mpi_communication.py | 10 ++++----- test/test_op.py | 8 ++++---- test/test_reductions.py | 10 ++++----- test/test_trace_pair.py | 4 ++-- 17 files changed, 64 insertions(+), 63 deletions(-) diff --git a/examples/advection/surface.py b/examples/advection/surface.py index 554df7c8..34d59cb4 100644 --- a/examples/advection/surface.py +++ b/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.discretization import make_discretization_collection - dcoll = DiscretizationCollection( + dcoll = make_discretization_collection( actx, mesh, discr_tag_to_group_factory=discr_tag_to_group_factory ) diff --git a/examples/advection/var-velocity.py b/examples/advection/var-velocity.py index 9c230106..211df353 100644 --- a/examples/advection/var-velocity.py +++ b/examples/advection/var-velocity.py @@ -139,9 +139,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.discretization import make_discretization_collection - dcoll = DiscretizationCollection( + dcoll = make_discretization_collection( actx, mesh, order=order, discr_tag_to_group_factory=discr_tag_to_group_factory ) diff --git a/examples/advection/weak.py b/examples/advection/weak.py index 270574fc..ddd91832 100644 --- a/examples/advection/weak.py +++ b/examples/advection/weak.py @@ -131,9 +131,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.discretization import make_discretization_collection - dcoll = DiscretizationCollection(actx, mesh, order=order) + dcoll = make_discretization_collection(actx, mesh, order=order) # }}} diff --git a/examples/euler/acoustic_pulse.py b/examples/euler/acoustic_pulse.py index e126abe7..117399dd 100644 --- a/examples/euler/acoustic_pulse.py +++ b/examples/euler/acoustic_pulse.py @@ -126,7 +126,7 @@ def run_acoustic_pulse(actx, default_simplex_group_factory, ) - from grudge import DiscretizationCollection + from grudge.discretization import make_discretization_collection from grudge.dof_desc import DISCR_TAG_BASE, DISCR_TAG_QUAD exp_name = f"fld-acoustic-pulse-N{order}-K{resolution}" @@ -136,7 +136,7 @@ def run_acoustic_pulse(actx, else: quad_tag = None - dcoll = DiscretizationCollection( + dcoll = make_discretization_collection( actx, mesh, discr_tag_to_group_factory={ DISCR_TAG_BASE: default_simplex_group_factory( diff --git a/examples/euler/vortex.py b/examples/euler/vortex.py index 07c23f31..443526d6 100644 --- a/examples/euler/vortex.py +++ b/examples/euler/vortex.py @@ -74,7 +74,7 @@ def run_vortex(actx, order=3, resolution=8, final_time=5, default_simplex_group_factory, ) - from grudge import DiscretizationCollection + from grudge.discretization import make_discretization_collection from grudge.dof_desc import DISCR_TAG_BASE, DISCR_TAG_QUAD exp_name = f"fld-vortex-N{order}-K{resolution}-{flux_type}" @@ -85,7 +85,7 @@ def run_vortex(actx, order=3, resolution=8, final_time=5, else: quad_tag = None - dcoll = DiscretizationCollection( + dcoll = make_discretization_collection( actx, mesh, discr_tag_to_group_factory={ DISCR_TAG_BASE: default_simplex_group_factory( diff --git a/examples/geometry.py b/examples/geometry.py index 63e66cf9..5d843912 100644 --- a/examples/geometry.py +++ b/examples/geometry.py @@ -32,8 +32,9 @@ import pyopencl.tools as cl_tools from grudge.array_context import PyOpenCLArrayContext -from grudge import DiscretizationCollection, shortcuts -import grudge.geometry as geo +from grudge import shortcuts +from grudge import geometry +from grudge.discretization import make_discretization_collection def main(write_output=True): @@ -47,13 +48,13 @@ def main(write_output=True): from meshmode.mesh import BTAG_ALL 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) + mesh = generate_warped_rect_mesh(dim=2, order=4, nelements_side=6) + dcoll = make_discretization_collection(actx, mesh, order=4) nodes = actx.thaw(dcoll.nodes()) bdry_nodes = actx.thaw(dcoll.nodes(dd=BTAG_ALL)) - bdry_normals = geo.normal(actx, dcoll, dd=BTAG_ALL) + bdry_normals = geometry.normal(actx, dcoll, dd=BTAG_ALL) if write_output: vis = shortcuts.make_visualizer(dcoll) diff --git a/examples/maxwell/cavities.py b/examples/maxwell/cavities.py index 0376a0a0..c05272b2 100644 --- a/examples/maxwell/cavities.py +++ b/examples/maxwell/cavities.py @@ -31,9 +31,9 @@ import numpy as np import pyopencl as cl import pyopencl.tools as cl_tools -import grudge.op as op -from grudge import DiscretizationCollection +from grudge import op from grudge.array_context import PyOpenCLArrayContext +from grudge.discretization import make_discretization_collection from grudge.models.em import get_rectangular_cavity_mode from grudge.shortcuts import set_up_rk4 @@ -56,7 +56,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) diff --git a/examples/wave/var-propagation-speed.py b/examples/wave/var-propagation-speed.py index 48bd5276..3bbfe19d 100644 --- a/examples/wave/var-propagation-speed.py +++ b/examples/wave/var-propagation-speed.py @@ -32,9 +32,9 @@ import pyopencl as cl import pyopencl.tools as cl_tools from pytools.obj_array import flat_obj_array -import grudge.op as op -from grudge import DiscretizationCollection +from grudge import op from grudge.array_context import PyOpenCLArrayContext +from grudge.discretization import make_discretization_collection from grudge.shortcuts import set_up_rk4 @@ -56,7 +56,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] diff --git a/examples/wave/wave-op-var-velocity.py b/examples/wave/wave-op-var-velocity.py index 051d1371..8b1b28a2 100644 --- a/examples/wave/wave-op-var-velocity.py +++ b/examples/wave/wave-op-var-velocity.py @@ -37,7 +37,7 @@ from pytools.obj_array import flat_obj_array import grudge.geometry as geo import grudge.op as op from grudge.array_context import PyOpenCLArrayContext -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, rk4_step @@ -170,7 +170,7 @@ def main(ctx_factory, dim=2, order=3, visualize=False): 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), diff --git a/test/test_dt_utils.py b/test/test_dt_utils.py index 5d99e5ad..72998091 100644 --- a/test/test_dt_utils.py +++ b/test/test_dt_utils.py @@ -42,7 +42,7 @@ import mesh_data import pytest import grudge.op as op -from grudge import DiscretizationCollection +from grudge.discretization import make_discretization_collection logger = logging.getLogger(__name__) @@ -73,7 +73,7 @@ def test_geometric_factors_regular_refinement(actx_factory, name): min_factors = [] for resolution in builder.resolutions: mesh = builder.get_mesh(resolution, order) - dcoll = DiscretizationCollection(actx, mesh, order=order) + dcoll = make_discretization_collection(actx, mesh, order=order) min_factors.append( actx.to_numpy( op.nodal_min(dcoll, "vol", actx.thaw(dt_geometric_factors(dcoll)))) @@ -87,7 +87,7 @@ def test_geometric_factors_regular_refinement(actx_factory, name): # Make sure it works with empty meshes mesh = builder.get_mesh(0) - dcoll = DiscretizationCollection(actx, mesh, order=order) + dcoll = make_discretization_collection(actx, mesh, order=order) factors = actx.thaw(dt_geometric_factors(dcoll)) # noqa: F841 @@ -114,7 +114,7 @@ def test_non_geometric_factors(actx_factory, name): degrees = list(range(1, 8)) for degree in degrees: mesh = builder.get_mesh(1, degree) - dcoll = DiscretizationCollection(actx, mesh, order=degree) + dcoll = make_discretization_collection(actx, mesh, order=degree) factors.append(min(dt_non_geometric_factors(dcoll))) # Crude estimate, factors should behave like 1/N**2 @@ -133,7 +133,7 @@ def test_build_jacobian(actx_factory): mesh = mgen.generate_regular_rect_mesh(a=[0], b=[1], nelements_per_axis=(3,)) assert mesh.dim == 1 - dcoll = DiscretizationCollection(actx, mesh, order=1) + dcoll = make_discretization_collection(actx, mesh, order=1) def rhs(x): return 3*x**2 + 2*x + 5 @@ -162,7 +162,7 @@ def test_wave_dt_estimate(actx_factory, dim, degree, visualize=False): nelements_per_axis=(3,)*dim) assert mesh.dim == dim - dcoll = DiscretizationCollection(actx, mesh, order=degree) + dcoll = make_discretization_collection(actx, mesh, order=degree) from grudge.models.wave import WeakWaveOperator wave_op = WeakWaveOperator(dcoll, c=1) diff --git a/test/test_euler_model.py b/test/test_euler_model.py index 83d19a4e..1540ef14 100644 --- a/test/test_euler_model.py +++ b/test/test_euler_model.py @@ -52,7 +52,7 @@ def test_euler_vortex_convergence(actx_factory, order): from meshmode.mesh.generation import generate_regular_rect_mesh from pytools.convergence import EOCRecorder - from grudge import DiscretizationCollection + from grudge.discretization import make_discretization_collection from grudge.dof_desc import DISCR_TAG_BASE, DISCR_TAG_QUAD from grudge.dt_utils import h_max_from_volume from grudge.models.euler import EulerOperator, vortex_initial_condition @@ -77,7 +77,7 @@ def test_euler_vortex_convergence(actx_factory, order): DISCR_TAG_QUAD: QuadratureSimplexGroupFactory(2*order) } - dcoll = DiscretizationCollection( + dcoll = make_discretization_collection( actx, mesh, discr_tag_to_group_factory=discr_tag_to_group_factory ) diff --git a/test/test_grudge.py b/test/test_grudge.py index 103e445b..3202435c 100644 --- a/test/test_grudge.py +++ b/test/test_grudge.py @@ -52,7 +52,7 @@ from pytools.obj_array import flat_obj_array import grudge.dof_desc as dof_desc import grudge.geometry as geo import grudge.op as op -from grudge import DiscretizationCollection, make_discretization_collection +from grudge.discretization import make_discretization_collection logger = logging.getLogger(__name__) @@ -88,7 +88,7 @@ def test_mass_mat_trig(actx_factory, ambient_dim, discr_tag): mesh = mgen.generate_regular_rect_mesh( a=(a,)*ambient_dim, b=(b,)*ambient_dim, nelements_per_axis=(nel_1d,)*ambient_dim, order=1) - dcoll = DiscretizationCollection( + dcoll = make_discretization_collection( actx, mesh, order=order, discr_tag_to_group_factory=discr_tag_to_group_factory ) @@ -193,7 +193,7 @@ def test_mass_surface_area(actx_factory, name): for resolution in builder.resolutions: mesh = builder.get_mesh(resolution, order) - dcoll = DiscretizationCollection(actx, mesh, order=order) + dcoll = make_discretization_collection(actx, mesh, order=order) volume_discr = dcoll.discr_from_dd(dof_desc.DD_VOLUME) logger.info("ndofs: %d", volume_discr.ndofs) @@ -352,7 +352,7 @@ def test_face_normal_surface(actx_factory, mesh_name): order = 4 mesh = builder.get_mesh(builder.resolutions[0], order) - dcoll = DiscretizationCollection(actx, mesh, order=order) + dcoll = make_discretization_collection(actx, mesh, order=order) volume_discr = dcoll.discr_from_dd(dof_desc.DD_VOLUME) logger.info("ndofs: %d", volume_discr.ndofs) @@ -443,7 +443,7 @@ def test_tri_diff_mat(actx_factory, dim, order=4): mesh = mgen.generate_regular_rect_mesh(a=(-0.5,)*dim, b=(0.5,)*dim, nelements_per_axis=(n,)*dim, order=4) - dcoll = DiscretizationCollection(actx, mesh, order=4) + dcoll = make_discretization_collection(actx, mesh, order=4) volume_discr = dcoll.discr_from_dd(dof_desc.DD_VOLUME) x = actx.thaw(volume_discr.nodes()) @@ -657,7 +657,7 @@ def test_surface_divergence_theorem(actx_factory, mesh_name, visualize=False): from meshmode.discretization.poly_element import QuadratureSimplexGroupFactory qtag = dof_desc.DISCR_TAG_QUAD - dcoll = DiscretizationCollection( + dcoll = make_discretization_collection( actx, mesh, order=order, discr_tag_to_group_factory={ qtag: QuadratureSimplexGroupFactory(2 * order) @@ -820,7 +820,7 @@ def test_convergence_advec(actx_factory, mesh_name, mesh_pars, op_type, flux_typ WeakAdvectionOperator, ) - dcoll = DiscretizationCollection(actx, mesh, order=order) + dcoll = make_discretization_collection(actx, mesh, order=order) op_class = {"strong": StrongAdvectionOperator, "weak": WeakAdvectionOperator}[op_type] adv_operator = op_class(dcoll, v, @@ -914,7 +914,7 @@ def test_convergence_maxwell(actx_factory, order): b=(1.0,)*dims, nelements_per_axis=(n,)*dims) - dcoll = DiscretizationCollection(actx, mesh, order=order) + dcoll = make_discretization_collection(actx, mesh, order=order) epsilon = 1 mu = 1 @@ -1019,7 +1019,7 @@ def test_improvement_quadrature(actx_factory, order): else: discr_tag_to_group_factory = {} - dcoll = DiscretizationCollection( + dcoll = make_discretization_collection( actx, mesh, order=order, discr_tag_to_group_factory=discr_tag_to_group_factory ) @@ -1072,7 +1072,7 @@ def test_bessel(actx_factory): b=(1.0,)*dims, nelements_per_axis=(8,)*dims) - dcoll = DiscretizationCollection(actx, mesh, order=3) + dcoll = make_discretization_collection(actx, mesh, order=3) nodes = actx.thaw(dcoll.nodes()) r = actx.np.sqrt(nodes[0]**2 + nodes[1]**2) @@ -1106,7 +1106,7 @@ def test_norm_real(actx_factory, p): mesh = mgen.generate_regular_rect_mesh( a=(0,)*dim, b=(1,)*dim, nelements_per_axis=(8,)*dim, order=1) - dcoll = DiscretizationCollection(actx, mesh, order=4) + dcoll = make_discretization_collection(actx, mesh, order=4) nodes = actx.thaw(dcoll.nodes()) norm = op.norm(dcoll, nodes[0], p) @@ -1129,7 +1129,7 @@ def test_norm_complex(actx_factory, p): mesh = mgen.generate_regular_rect_mesh( a=(0,)*dim, b=(1,)*dim, nelements_per_axis=(8,)*dim, order=1) - dcoll = DiscretizationCollection(actx, mesh, order=4) + dcoll = make_discretization_collection(actx, mesh, order=4) nodes = actx.thaw(dcoll.nodes()) norm = op.norm(dcoll, (1 + 1j)*nodes[0], p) @@ -1152,7 +1152,7 @@ def test_norm_obj_array(actx_factory, p): mesh = mgen.generate_regular_rect_mesh( a=(0,)*dim, b=(1,)*dim, nelements_per_axis=(8,)*dim, order=1) - dcoll = DiscretizationCollection(actx, mesh, order=4) + dcoll = make_discretization_collection(actx, mesh, order=4) nodes = actx.thaw(dcoll.nodes()) norm = op.norm(dcoll, nodes, p) @@ -1183,7 +1183,7 @@ def test_empty_boundary(actx_factory): mesh = mgen.generate_regular_rect_mesh( a=(-0.5,)*dim, b=(0.5,)*dim, nelements_per_axis=(8,)*dim, order=4) - dcoll = DiscretizationCollection(actx, mesh, order=4) + dcoll = make_discretization_collection(actx, mesh, order=4) normal = geo.normal(actx, dcoll, BTAG_NONE) from meshmode.dof_array import DOFArray for component in normal: diff --git a/test/test_metrics.py b/test/test_metrics.py index f26778e2..ec766342 100644 --- a/test/test_metrics.py +++ b/test/test_metrics.py @@ -44,7 +44,7 @@ import pytest import meshmode.mesh.generation as mgen from meshmode.dof_array import flat_norm -from grudge import DiscretizationCollection +from grudge.discretization import make_discretization_collection logger = logging.getLogger(__name__) @@ -85,7 +85,7 @@ def test_inverse_metric(actx_factory, dim, nonaffine, use_quad): from grudge.dof_desc import DISCR_TAG_BASE, DISCR_TAG_QUAD, as_dofdesc - 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), diff --git a/test/test_mpi_communication.py b/test/test_mpi_communication.py index 9998a1b0..f1ce0073 100644 --- a/test/test_mpi_communication.py +++ b/test/test_mpi_communication.py @@ -31,8 +31,6 @@ import sys import numpy as np import pytest -import pyopencl as cl - from grudge.array_context import MPIPyOpenCLArrayContext, MPIPytatoArrayContext @@ -45,7 +43,7 @@ from pytools.obj_array import flat_obj_array import grudge.dof_desc as dof_desc import grudge.op as op -from grudge import DiscretizationCollection +from grudge.discretization import make_discretization_collection from grudge.shortcuts import rk4_step @@ -81,6 +79,8 @@ def run_test_with_mpi_inner(): from pickle import loads f, (actx_class, *args) = loads(b64decode(os.environ["INVOCATION_INFO"].encode())) + import pyopencl as cl + cl_context = cl.create_some_context() queue = cl.CommandQueue(cl_context) @@ -136,7 +136,7 @@ def _test_func_comparison_mpi_communication_entrypoint(actx): else: local_mesh = comm.scatter(None) - dcoll = DiscretizationCollection(actx, local_mesh, order=5) + dcoll = make_discretization_collection(actx, local_mesh, order=5) x = actx.thaw(dcoll.nodes()) myfunc = actx.np.sin(np.dot(x, [2, 3])) @@ -214,7 +214,7 @@ def _test_mpi_wave_op_entrypoint(actx, visualize=False): else: local_mesh = comm.scatter(None) - dcoll = DiscretizationCollection(actx, local_mesh, order=order) + dcoll = make_discretization_collection(actx, local_mesh, order=order) def source_f(actx, dcoll, t=0): source_center = np.array([0.1, 0.22, 0.33])[:dcoll.dim] diff --git a/test/test_op.py b/test/test_op.py index 1ad9ddb9..79890ced 100644 --- a/test/test_op.py +++ b/test/test_op.py @@ -33,7 +33,7 @@ from meshmode.discretization.poly_element import ( from meshmode.mesh import BTAG_ALL from pytools.obj_array import make_obj_array -from grudge import DiscretizationCollection, geometry as geo, op +from grudge import geometry, op from grudge.array_context import PytestPyOpenCLArrayContextFactory from grudge.discretization import make_discretization_collection from grudge.dof_desc import ( @@ -121,7 +121,7 @@ def test_gradient(actx_factory, form, dim, order, vectorize, nested, def get_flux(u_tpair, dcoll=dcoll): dd = u_tpair.dd dd_allfaces = dd.with_domain_tag("all_faces") - normal = geo.normal(actx, dcoll, dd) + normal = geometry.normal(actx, dcoll, dd) u_avg = u_tpair.avg if vectorize: if nested: @@ -234,7 +234,7 @@ def test_divergence(actx_factory, form, dim, order, vectorize, nested, a=(-1,)*dim, b=(1,)*dim, nelements_per_axis=(n,)*dim) - dcoll = DiscretizationCollection(actx, mesh, order=order) + dcoll = make_discretization_collection(actx, mesh, order=order) def f(x, dcoll=dcoll): result = make_obj_array([dcoll.zeros(actx) + (i+1) for i in range(dim)]) @@ -273,7 +273,7 @@ def test_divergence(actx_factory, form, dim, order, vectorize, nested, def get_flux(u_tpair, dcoll=dcoll): dd = u_tpair.dd dd_allfaces = dd.with_dtag("all_faces") - normal = geo.normal(actx, dcoll, dd) + normal = geometry.normal(actx, dcoll, dd) flux = u_tpair.avg @ normal return op.project(dcoll, dd, dd_allfaces, flux) diff --git a/test/test_reductions.py b/test/test_reductions.py index 33f98b41..ac3e65d3 100644 --- a/test/test_reductions.py +++ b/test/test_reductions.py @@ -48,7 +48,7 @@ from meshmode.dof_array import flatten from pytools.obj_array import make_obj_array import grudge.op as op -from grudge import DiscretizationCollection +from grudge.discretization import make_discretization_collection logger = logging.getLogger(__name__) @@ -66,7 +66,7 @@ def test_nodal_reductions(actx_factory, mesh_size, with_initial): builder = mesh_data.BoxMeshBuilder1D() mesh = builder.get_mesh(mesh_size) - dcoll = DiscretizationCollection(actx, mesh, order=4) + dcoll = make_discretization_collection(actx, mesh, order=4) x = actx.thaw(dcoll.nodes()) def f(x): @@ -132,7 +132,7 @@ def test_elementwise_reductions(actx_factory): nelements = 4 mesh = builder.get_mesh(nelements) - dcoll = DiscretizationCollection(actx, mesh, order=4) + dcoll = make_discretization_collection(actx, mesh, order=4) x = actx.thaw(dcoll.nodes()) def f(x): @@ -192,7 +192,7 @@ def test_nodal_reductions_with_container(actx_factory): builder = mesh_data.BoxMeshBuilder2D() mesh = builder.get_mesh(4) - dcoll = DiscretizationCollection(actx, mesh, order=4) + dcoll = make_discretization_collection(actx, mesh, order=4) x = actx.thaw(dcoll.nodes()) def f(x): @@ -239,7 +239,7 @@ def test_elementwise_reductions_with_container(actx_factory): nelements = 4 mesh = builder.get_mesh(nelements) - dcoll = DiscretizationCollection(actx, mesh, order=4) + dcoll = make_discretization_collection(actx, mesh, order=4) x = actx.thaw(dcoll.nodes()) def f(x): diff --git a/test/test_trace_pair.py b/test/test_trace_pair.py index 5bfbb0eb..43dc6abf 100644 --- a/test/test_trace_pair.py +++ b/test/test_trace_pair.py @@ -27,8 +27,8 @@ import meshmode.mesh.generation as mgen from arraycontext import pytest_generate_tests_for_array_contexts from meshmode.dof_array import DOFArray -from grudge import DiscretizationCollection from grudge.array_context import PytestPyOpenCLArrayContextFactory +from grudge.discretization import make_discretization_collection from grudge.trace_pair import TracePair @@ -52,7 +52,7 @@ def test_trace_pair(actx_factory): a=(-1,)*dim, b=(1,)*dim, nelements_per_axis=(n,)*dim) - dcoll = DiscretizationCollection(actx, mesh, order=order) + dcoll = make_discretization_collection(actx, mesh, order=order) rng = np.random.default_rng(1234) -- GitLab