diff --git a/firedrake/tsfc_interface.py b/firedrake/tsfc_interface.py index 80287187c5..34fe5e7fbf 100644 --- a/firedrake/tsfc_interface.py +++ b/firedrake/tsfc_interface.py @@ -12,7 +12,6 @@ import ufl import finat.ufl from ufl import conj, Form, ZeroBaseForm ->>>>>>> 40d114f88 (introduce MixedMesh) from .ufl_expr import TestFunction, extract_domains from tsfc import compile_form as original_tsfc_compile_form diff --git a/firedrake/ufl_expr.py b/firedrake/ufl_expr.py index 3b69f8698b..bca7fe538c 100644 --- a/firedrake/ufl_expr.py +++ b/firedrake/ufl_expr.py @@ -7,7 +7,6 @@ from ufl.domain import as_domain import firedrake from firedrake import utils, function, cofunction -from firedrake.mesh import MeshSequenceGeometry from firedrake.constant import Constant from firedrake.petsc import PETSc @@ -380,6 +379,8 @@ def extract_domains(f): list of firedrake.mesh.MeshGeometry Extracted domains. """ + from firedrake.mesh import MeshSequenceGeometry + if isinstance(f, firedrake.slate.TensorBase): return f.ufl_domains() elif isinstance(f, cofunction.Cofunction):