merge conflict

Author: pbrubeck

firedrake/assemble.py

@@ -556,8 +556,6 @@ def base_form_assembly_visitor(self, expr, tensor, *args):
             result = expr.assemble(assembly_opts=opts)
             return tensor.assign(result) if tensor else result
         elif isinstance(expr, ufl.Interpolate):
-            if not isinstance(expr, firedrake.Interpolate):
-                expr = firedrake.Interpolate(*reversed(expr.dual_args()))
             # Replace assembled children
             _, operand = expr.argument_slots()
             v, *assembled_operand = args