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

* port FML changes from gusto * update docstring style * fix lint and docstring issues
firedrakeproject · Oct 9, 2023 · 8dfdf33 · 8dfdf33
1 parent 92c0fa8
commit 8dfdf33
Show file tree

Hide file tree

Showing 11 changed files with 420 additions and 223 deletions.
diff --git a/firedrake/__init__.py b/firedrake/__init__.py
@@ -75,7 +75,6 @@
 from firedrake.cofunction 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 *
@@ -106,6 +105,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

diff --git a/firedrake/fml/__init__.py b/firedrake/fml/__init__.py
@@ -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