Skip to content
This repository has been archived by the owner on Dec 6, 2024. It is now read-only.

Move ufl legacy elements to finat #111

Merged
merged 9 commits into from
Nov 15, 2023
Merged

Move ufl legacy elements to finat #111

merged 9 commits into from
Nov 15, 2023

Conversation

mscroggs
Copy link
Contributor

@mscroggs mscroggs commented Oct 16, 2023

This change follows on from FEniCS/ufl#197, and needs this to be merged into the Firedrake fork of UFL.

Moving UFL element code to FInAT so that ufl.legacy can be removed.

This is intended to be a temporary solution. Longer term, the plan could be to make finat elements inherit from ufl.AbstractFiniteElement so that they can be used directly without this wrapper code.

This PR will allow firedrakeproject/firedrake#3166, firedrakeproject/tsfc#302, and NGSolve/ngsPETSc#7 to be done.

If these four PRs are merged (and the latest UFL is merged into the Firedrake fork), the the UFL elements used by Firedrake will all be defined in FInAT (currently in finat.ufl). This code can then gradually be simplified / merged with classes that already exist in FInAT without any need to change UFL.

connorjward
connorjward previously approved these changes Nov 15, 2023
requirements-git.txt Outdated Show resolved Hide resolved
@@ -1,2 +1,3 @@
git+https://github.com/firedrakeproject/fiat.git#egg=fenics-fiat
git+https://github.com/firedrakeproject/tsfc.git#egg=tsfc
git+https://github.com/firedrakeproject/ufl.git@dolci/merge_upstream_2
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change branch before merging. Pointing here for testing.

Copy link
Contributor

@JDBetteridge JDBetteridge left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't worry about adding these I'll add the suggestions to a batch once I've checked the other branches 🙂

requirements-git.txt Outdated Show resolved Hide resolved
Co-authored-by: Jack Betteridge <[email protected]>
@ksagiyam ksagiyam merged commit 4066827 into master Nov 15, 2023
1 check passed
@ksagiyam ksagiyam deleted the mscroggs/ufl-elements branch November 15, 2023 13:32
lrtfm added a commit to lrtfm/fdutils that referenced this pull request Dec 24, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants