Skip to content

Clean up variants #332

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

Merged
pbrubeck merged 2 commits into from
Nov 25, 2024
Merged

Clean up variants #332

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40f471d
Clean up variants
pbrubeck Nov 20, 2024
5c6680c
Merge branch 'master' into pbrubeck/fix/variants
pbrubeck Nov 25, 2024
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
18 changes: 9 additions & 9 deletions tsfc/finatinterface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ def convert_finiteelement(element, **kwargs):
finat_elem, deps = _create_element(element, **kwargs)
return finat.FlattenedDimensions(finat_elem), deps

kw = {}
finat_kwargs = {}
kind = element.variant()
if kind is None:
kind = 'spectral' # default variant
Expand All @@ -182,9 +182,9 @@ def convert_finiteelement(element, **kwargs):
lmbda = finat.GaussLobattoLegendre
elif element.cell.cellname() == "interval" and kind in cg_interval_variants:
lmbda = cg_interval_variants[kind]
elif kind.startswith('integral') or kind in ['demkowicz', 'fdm']:
elif any(map(kind.startswith, ['integral', 'demkowicz', 'fdm'])):
lmbda = finat.IntegratedLegendre
kw["variant"] = kind
finat_kwargs["variant"] = kind
elif kind in ['mgd', 'feec', 'qb', 'mse']:
degree = element.degree()
shift_axes = kwargs["shift_axes"]
Expand All @@ -194,16 +194,16 @@ def convert_finiteelement(element, **kwargs):
else:
# Let FIAT handle the general case
lmbda = finat.Lagrange
kw["variant"] = kind
finat_kwargs["variant"] = kind

elif element.family() in ["Discontinuous Lagrange", "Discontinuous Lagrange L2"]:
if kind == 'spectral':
lmbda = finat.GaussLegendre
elif element.cell.cellname() == "interval" and kind in dg_interval_variants:
lmbda = dg_interval_variants[kind]
elif kind.startswith('integral') or kind in ['demkowicz', 'fdm']:
elif any(map(kind.startswith, ['integral', 'demkowicz', 'fdm'])):
lmbda = finat.Legendre
kw["variant"] = kind
finat_kwargs["variant"] = kind
elif kind in ['mgd', 'feec', 'qb', 'mse']:
degree = element.degree()
shift_axes = kwargs["shift_axes"]
Expand All @@ -213,12 +213,12 @@ def convert_finiteelement(element, **kwargs):
else:
# Let FIAT handle the general case
lmbda = finat.DiscontinuousLagrange
kw["variant"] = kind
finat_kwargs["variant"] = kind

elif element.variant() is not None:
kw["variant"] = element.variant()
finat_kwargs["variant"] = element.variant()

return lmbda(cell, element.degree(), **kw), set()
return lmbda(cell, element.degree(), **finat_kwargs), set()


# Element modifiers and compound element types
Expand Down