Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Check all subdomain data is the same #2369

Merged
merged 8 commits into from
Oct 31, 2022
Merged

Check all subdomain data is the same #2369

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
43bfaf9
Check all subdomain data is the same
jpdean Sep 16, 2022
9fce163
Use UFL branch
jpdean Sep 16, 2022
e4c60d2
Merge branch 'main' into jpdean/multiple_subdomain_data
jpdean Oct 17, 2022
1bee2ab
Merge branch 'main' into jpdean/multiple_subdomain_data
chrisrichardson Oct 21, 2022
d92bff4
Try to use sd.get(domain)
chrisrichardson Oct 21, 2022
aa95e56
Merge branch 'main' into jpdean/multiple_subdomain_data
jpdean Oct 31, 2022
b92737e
Change UFL branch
jpdean Oct 31, 2022
f880cf8
Merge branch 'main' into jpdean/multiple_subdomain_data
chrisrichardson Oct 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion python/dolfinx/fem/forms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,15 @@ def _form(form):
""""Compile a single UFL form"""
# Extract subdomain data from UFL form
sd = form.subdomain_data()
subdomains, = list(sd.values()) # Assuming single domain
domain, = list(sd.keys()) # Assuming single domain
# Get subdomain data for each integral type
subdomains = {}
for integral_type, data in sd.get(domain).items():
# Check that the subdomain data for each integral of this type is
# the same
assert all([id(d) == id(data[0]) for d in data])
subdomains[integral_type] = data[0]

mesh = domain.ufl_cargo()
if mesh is None:
raise RuntimeError("Expecting to find a Mesh in the form.")
Expand Down