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

Bring across updates to FML in Gusto to the FML branch #3055

Merged
merged 3 commits into from
Aug 11, 2023
Merged

Bring across updates to FML in Gusto to the FML branch #3055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
20ea2c0
port FML changes from gusto
tommbendall Aug 2, 2023
67bde4c
update docstring style
tommbendall Aug 3, 2023
4ad0ea3
fix lint and docstring issues
tommbendall Aug 5, 2023
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
2 changes: 1 addition & 1 deletion firedrake/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@
from firedrake.checkpointing import *
from firedrake.constant import *
from firedrake.exceptions import *
from firedrake.fml import *
from firedrake.function import *
from firedrake.functionspace import *
from firedrake.interpolation import *
Expand Down Expand Up @@ -105,6 +104,7 @@
from firedrake.ensemble import *
from firedrake.randomfunctiongen import *
from firedrake.progress_bar import ProgressBar # noqa: F401
from firedrake.fml import *

from firedrake.logging import *
# Set default log level
Expand Down
4 changes: 2 additions & 2 deletions firedrake/fml/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
from gusto.fml.form_manipulation_language import * # noqa
from gusto.fml.replacement import * # noqa
from firedrake.fml.form_manipulation_language import * # noqa
from firedrake.fml.replacement import * # noqa
Loading