Skip to content

Commit 85d9812

Browse files
committed
Support multiple volumes in a discretization collection
1 parent ef39455 commit 85d9812

23 files changed

Lines changed: 1436 additions & 727 deletions

doc/conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ def get_version():
4040
"https://documen.tician.de/arraycontext/": None,
4141
"https://documen.tician.de/meshmode/": None,
4242
"https://documen.tician.de/loopy/": None,
43+
"https://mpi4py.readthedocs.io/en/stable": None,
4344
}
4445

4546
# index-page demo uses pyopencl via plot_directive

examples/hello-grudge.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
from meshmode.mesh.generation import generate_box_mesh
1616
from meshmode.array_context import PyOpenCLArrayContext
1717
from arraycontext import thaw
18-
from grudge.dof_desc import DTAG_BOUNDARY, FACE_RESTR_INTERIOR
18+
from grudge.dof_desc import BoundaryDomainTag, FACE_RESTR_INTERIOR
1919

2020

2121
ctx = cl.create_some_context()
@@ -52,8 +52,8 @@ def flux(dcoll, u_tpair):
5252

5353

5454
vol_discr = dcoll.discr_from_dd("vol")
55-
left_bndry = DTAG_BOUNDARY("left")
56-
right_bndry = DTAG_BOUNDARY("right")
55+
left_bndry = BoundaryDomainTag("left")
56+
right_bndry = BoundaryDomainTag("right")
5757

5858
x_vol = thaw(dcoll.nodes(), actx)
5959
x_bndry = thaw(dcoll.discr_from_dd(left_bndry).nodes(), actx)

examples/old_symbolics/dagrt-fusion.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1206,15 +1206,17 @@ def problem_stats(order=3):
12061206
with open_output_file("grudge-problem-stats.txt") as outf:
12071207
_, dg_discr_2d = get_wave_op_with_discr(
12081208
actx, dims=2, order=order)
1209-
print("Number of 2D elements:", dg_discr_2d.mesh.nelements, file=outf)
1209+
mesh_2d = dg_discr_2d.discr_from_dd("vol").mesh
1210+
print("Number of 2D elements:", mesh_2d.nelements, file=outf)
12101211
vol_discr_2d = dg_discr_2d.discr_from_dd("vol")
12111212
dofs_2d = {group.nunit_dofs for group in vol_discr_2d.groups}
12121213
from pytools import one
12131214
print("Number of DOFs per 2D element:", one(dofs_2d), file=outf)
12141215

12151216
_, dg_discr_3d = get_wave_op_with_discr(
12161217
actx, dims=3, order=order)
1217-
print("Number of 3D elements:", dg_discr_3d.mesh.nelements, file=outf)
1218+
mesh_3d = dg_discr_3d.discr_from_dd("vol").mesh
1219+
print("Number of 3D elements:", mesh_3d.nelements, file=outf)
12181220
vol_discr_3d = dg_discr_3d.discr_from_dd("vol")
12191221
dofs_3d = {group.nunit_dofs for group in vol_discr_3d.groups}
12201222
from pytools import one

grudge/__init__.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@
2323
import grudge.symbolic as sym
2424
from grudge.execution import bind
2525

26-
from grudge.discretization import DiscretizationCollection
26+
from grudge.discretization import (
27+
DiscretizationCollection, make_discretization_collection)
2728

2829
__all__ = [
29-
"sym", "bind", "DiscretizationCollection"
30+
"sym", "bind", "DiscretizationCollection", "make_discretization_collection"
3031
]

0 commit comments

Comments
 (0)