This repository has been archived by the owner on Dec 6, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 13
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced Oct 16, 2023
connorjward
previously approved these changes
Nov 15, 2023
ReubenHill
reviewed
Nov 15, 2023
Point to correct fork
ReubenHill
reviewed
Nov 15, 2023
requirements-git.txt
Outdated
@@ -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 |
There was a problem hiding this comment.
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.
JDBetteridge
suggested changes
Nov 15, 2023
There was a problem hiding this 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 🙂
Co-authored-by: Jack Betteridge <[email protected]>
ksagiyam
approved these changes
Nov 15, 2023
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.