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

Move around parts of FML #392

Merged
merged 29 commits into from
Jul 28, 2023
Merged

Move around parts of FML #392

merged 29 commits into from
Jul 28, 2023

Conversation

tommbendall
Copy link
Contributor

@tommbendall tommbendall commented Jul 24, 2023 •
edited
Loading

This:

  • renames form_manipulation_labelling as form_manipulation_language
  • moves the replacement routines from labels.py to fml.replacement.py
  • puts two special labels (subject and name) into FML
  • introduces Gusto's Perp operator to give us properly working replacement using perp. This is also a PR in UFL: Implements the perp operator as a class FEniCS/ufl#184, so once that is in then we can remove our perp and our monkey patch from the init
  • removes some type checking from FML
  • overhauls the replacement, allowing new and old functions to be indexed separately
  • makes a couple of changes to the NullTerm
  • adds a workflow demo test

tommbendall and others added 27 commits July 24, 2023 16:58
@tommbendall
move replacement routines and common labels into FML folder. Fix name…
b6d469c 
… of FML
@tommbendall
fix various import problems
972a91e
@tommbendall
add a new perp implementation
204d24c
@tommbendall
fix silly missing comma
eeb7dbd
@tommbendall
get new perp operator working, and add monkey patch to __init__ to ma…
cee4ae5 
…ke us not reliant on ufl
@tommbendall
remove perp from equations
5e7b8d8
@tommbendall
Merge branch 'restructure_fml' into new_perp_operator
830848f
@tommbendall
remove perp from replacement
65e3266
@JHopeCollins
start tidying indexing for replace_* fml functions
1a25a5d
@tommbendall
fix lint!!
d1283b3
@JHopeCollins
correct replace if statements
2d2fe98
@tommbendall
make sure as_vector is imported where it is needed
8948cb3
@JHopeCollins
parameterized replace test
d1de427
@tommbendall
de-gusto the replace_perp test, which should move with the fml code
caa0f40
@JHopeCollins
remove old _replace_dict method and flake8
9ac02e2
@JHopeCollins
new replace_subject tests
b3b0f4a
@JHopeCollins
correct replace_subject calls in tests and gusto
79f9650
@jshipton
we do need the old index for test and trial functions
27f2f3c
@jshipton
add tests for replacing test and trial functions
ca840e3
@jshipton
Merge branch 'JHopeCollins/indexed_replace' of https://github.com/fir…
9243115 
…edrakeproject/gusto into JHopeCollins/indexed_replace
@jshipton
fix lint
4c8592d
@jshipton
rename file
af4f6c8
@jshipton
Merge branch 'restructure_fml' into JHopeCollins/indexed_replace
172ee74
@tommbendall
Merge pull request #395 from firedrakeproject/JHopeCollins/indexed_re…
2b311c3 
…place

Split apart the index argument to the `replace_subject,trial,test` functions into `idx_new` and `idx_out`
@tommbendall
Merge branch 'main' into restructure_fml
5273255
@tommbendall
remove type checking from FML, improve use of NullTerm and add a work…
10341b4 
…flow test
@tommbendall
fix lint
fec71bf
jshipton
jshipton previously approved these changes Jul 28, 2023
View reviewed changes
Copy link
Contributor

@jshipton jshipton left a comment

Choose a reason for hiding this comment

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

This looks good to go!

@jshipton jshipton merged commit 399e085 into main Jul 28, 2023
4 checks passed
@jshipton jshipton deleted the restructure_fml branch July 28, 2023 10:51
@jshipton jshipton mentioned this pull request Jul 28, 2023
Closed
@tommbendall tommbendall mentioned this pull request Sep 26, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jshipton jshipton jshipton approved these changes

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

Successfully merging this pull request may close these issues.
3 participants
@tommbendall @jshipton @JHopeCollins