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

Use num_sub_entities(...) (new function in UFL) #571

Merged
merged 8 commits into from
Jun 27, 2023
Merged

Use num_sub_entities(...) (new function in UFL) #571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
56e94d6
use new num_sub_entities function
mscroggs Jun 7, 2023
03f6918
ufl branch
mscroggs Jun 7, 2023
8b7bfdb
Merge branch 'main' into mscroggs/ufl-cell
mscroggs Jun 7, 2023
22cf589
Merge branch 'main' into mscroggs/ufl-cell
mscroggs Jun 27, 2023
23ad564
ufl branches
mscroggs Jun 27, 2023
16b6a09
another branch
mscroggs Jun 27, 2023
70714ed
xfail for now
mscroggs Jun 27, 2023
87d0310
restore "ref: main"
mscroggs Jun 27, 2023
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: 2 additions & 0 deletions demo/test_demos.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@

@pytest.mark.parametrize("file", ufl_files)
def test_demo(file):
if file == "CellGeometry":
pytest.xfail()
if file in [
"MixedGradient", "TraceElement", # HDiv Trace
"MixedElasticity", # VectorElement of BDM
Expand Down
2 changes: 1 addition & 1 deletion ffcx/ir/elementtables.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ def get_ffcx_table_values(points, cell, integral_type, element, avg, entitytype,
# Tabulate table of basis functions and derivatives in points for each entity
tdim = cell.topological_dimension()
entity_dim = integral_type_to_entity_dim(integral_type, tdim)
num_entities = ufl.cell.num_cell_entities[cell.cellname()][entity_dim]
num_entities = cell.num_sub_entities(entity_dim)

# Extract arrays for the right scalar component
component_tables = []
Expand Down