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

Update UFL element interface: move elements to FInAT #3166

Merged
merged 50 commits into from
Nov 15, 2023
Merged

Update UFL element interface: move elements to FInAT #3166

merged 50 commits into from
Nov 15, 2023

Conversation

mscroggs
Copy link
Contributor

@mscroggs mscroggs commented Oct 16, 2023 •
edited
Loading

This is an extension of #3122.

In FInAT/FInAT#111, I moved the elements from ufl.legacy to finat.ufl. This PR updates tsfc to use the elements from there.

This is all a consequence of FEniCS/ufl#197.

(I've left #3122 up too for now in case this extension is not wanted.)

This PR is coupled with firedrakeproject/ufl#46, firedrakeproject/tsfc#302 (merged), FInAT/FInAT#111 (merged), and NGSolve/ngsPETSc#7 (merged).

@mscroggs
Set UFL branch
b140c15
@mscroggs
tsfc branch
7e820b2
@mscroggs
use ufl.legacy
40c39e9
@mscroggs
ufl.legacy in tests
ecdb138
@mscroggs
update mathods that are now properties
0a3c489
@mscroggs
Add more .legacy
d1c459f
@mscroggs
fixes
a12a32f
@mscroggs
not legacy
5c52519
@mscroggs
Rename HDivElement -> HDiv and HCurlElement -> HCurl
c354ffc
@mscroggs
replace as_domain
4248a51
@mscroggs
skip F401
7ebeb69
@mscroggs
from ufl.legacy import *
e110066
@mscroggs
HDiv -> HDivElement
013b975
@mscroggs
fix
ecf5e8b
@mscroggs
team
4ad8cd6
@mscroggs
update AUTHORS.rst
2fbd095
@mscroggs
adjust tolerance
3da1330
@mscroggs
Merge branch 'master' into mscroggs/newfl-legacy
47afc7c
@mscroggs
increase tolerance very slightly
4720901
@mscroggs
investigate test that's failing on CI
891854e
@mscroggs
no :
84c929d
@mscroggs
more useful prints
7640458
@mscroggs
print more mesh info
a8549e0
@mscroggs
remove parallel run of test
3fed974
@mscroggs
Merge branch 'master' into mscroggs/newfl-legacy
62fc231
@mscroggs
set ngsPETSc branch
07a273f
@mscroggs
move ufl.legacy to finat.ufl
e55301b
@mscroggs mscroggs marked this pull request as draft October 16, 2023 16:33
This was referenced Oct 16, 2023
Merged
Merged
This was referenced Nov 7, 2023
Closed
Merged
dham
dham previously requested changes Nov 8, 2023
View reviewed changes
Copy link
Member

@dham dham left a comment

Choose a reason for hiding this comment

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

There are minor things but there is also HDiv -> HDivElement which is a breaking API change that we can't make without warning.

requirements-git.txt Outdated Show resolved Hide resolved
tests/extrusion/test_2d_cohomology.py Outdated Show resolved Hide resolved
tests/output/test_io_mesh.py Outdated Show resolved Hide resolved
mscroggs
mscroggs commented Nov 8, 2023
View reviewed changes
tests/slate/test_mimetic.py Outdated Show resolved Hide resolved
tests/regression/test_fs_caching.py Outdated Show resolved Hide resolved
tests/regression/test_fs_caching.py Outdated Show resolved Hide resolved
tests/regression/test_fs_caching.py Outdated Show resolved Hide resolved
@mscroggs
Copy link
Contributor Author

I've fixed the behaviour of HDiv so that the change to HDivElement is no longer necessary. Hopefully this is ready to go now

ReubenHill
ReubenHill reviewed Nov 15, 2023
View reviewed changes
requirements-git.txt Outdated Show resolved Hide resolved
connorjward
connorjward reviewed Nov 15, 2023
View reviewed changes
Copy link
Contributor

@connorjward connorjward left a comment

Choose a reason for hiding this comment

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

99% fine. Happy to approve once my comments are addressed.

scripts/firedrake-install Outdated Show resolved Hide resolved
tests/extrusion/test_real_tensorproduct.py Show resolved Hide resolved
tests/output/test_io_mesh.py Show resolved Hide resolved
JDBetteridge
JDBetteridge requested changes Nov 15, 2023
View reviewed changes
Copy link
Member

@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 🙂

.github/workflows/build.yml Outdated Show resolved Hide resolved
.github/workflows/build.yml Outdated Show resolved Hide resolved
@JDBetteridge JDBetteridge merged commit dccf836 into master Nov 15, 2023
5 of 8 checks passed
@JDBetteridge JDBetteridge deleted the mscroggs/newfl-legacy2 branch November 15, 2023 13:35
@JDBetteridge
Copy link
Member

Thanks for all your hard work on this @mscroggs !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@connorjward connorjward connorjward left review comments

@ReubenHill ReubenHill ReubenHill left review comments

@UZerbinati UZerbinati UZerbinati left review comments

@JDBetteridge JDBetteridge JDBetteridge approved these changes

@dham dham dham left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@mscroggs @JDBetteridge @dham @UZerbinati @ReubenHill @connorjward