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.

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

Remove num_entity_dofs #659

Merged
merged 3 commits into from
Jan 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/pythonapp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
python-version: ['3.8', '3.9', '3.10', '3.11']
python-version: ['3.9', '3.10', '3.11']
steps:
- name: Checkout FFCx
uses: actions/checkout@v4
Expand Down
13 changes: 0 additions & 13 deletions ffcx/ir/representation.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ class DofMapIR(typing.NamedTuple):
num_global_support_dofs: int
num_element_support_dofs: int
entity_dofs: typing.List[typing.List[typing.List[int]]]
num_entity_dofs: typing.List[typing.List[int]]
entity_closure_dofs: typing.List[typing.List[typing.List[int]]]
num_entity_closure_dofs: typing.List[typing.List[int]]
num_sub_dofmaps: int
Expand Down Expand Up @@ -312,18 +311,6 @@ def _compute_dofmap_ir(element, element_numbers, dofmap_names):
if element.block_size > 1:
element = element._sub_element

# Precompute repeatedly used items
for i in element.num_entity_dofs:
# FIXME: this assumes the same number of DOFs on each entity of the same dim: this
# assumption will not be true for prisms and pyramids
if max(i) != min(i):
raise RuntimeError("Elements with different numbers of DOFs on subentities of the same dimension"
" are not yet supported in FFCx.")

# FIXME: This does not work for prisms and pyramids
num_dofs_per_entity = [i[0] for i in element.num_entity_dofs]
ir["num_entity_dofs"] = num_dofs_per_entity

ir["entity_dofs"] = element.entity_dofs
ir["entity_closure_dofs"] = element.entity_closure_dofs

Expand Down
1 change: 1 addition & 0 deletions ffcx/naming.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

import basix.ufl
import ffcx
import ffcx.codegeneration
import ufl


Expand Down
Loading