Replace manufactured coordinates coefficient

Use new interface that informs if a manufactured coordinates coefficient
is the first coefficient

Author: ReubenHill

firedrake/interpolation.py

@@ -231,10 +231,10 @@ def _interpolator(V, tensor, expr, subset, arguments, access):
     if not isinstance(expr, firedrake.Expression):
         if expr.ufl_domain() and expr.ufl_domain() != V.mesh():
             raise NotImplementedError("Interpolation onto another mesh not supported.")
-        ast, oriented, needs_cell_sizes, coefficients, _ = compile_expression_dual_evaluation(expr, to_element,
-                                                                                              domain=V.mesh(),
-                                                                                              parameters=parameters,
-                                                                                              coffee=False)
+        ast, oriented, needs_cell_sizes, coefficients, first_coeff_fake_coords, _ = compile_expression_dual_evaluation(expr, to_element,
+                                                                                                                       domain=V.mesh(),
+                                                                                                                       parameters=parameters,
+                                                                                                                       coffee=False)
         kernel = op2.Kernel(ast, ast.name, requires_zeroed_output_arguments=True)
     elif hasattr(expr, "eval"):
         to_pts = []
@@ -243,8 +243,8 @@ def _interpolator(V, tensor, expr, subset, arguments, access):
                 raise NotImplementedError("Can only interpolate Python kernels with Lagrange elements")
             pts, = dual.pt_dict.keys()
             to_pts.append(pts)
-
         kernel, oriented, needs_cell_sizes, coefficients = compile_python_kernel(expr, to_pts, to_element, V, coords)
+        first_coeff_fake_coords = False
     else:
         raise RuntimeError("Attempting to evaluate an Expression which has no value.")
 
@@ -254,6 +254,10 @@ def _interpolator(V, tensor, expr, subset, arguments, access):
         cell_set = subset
     parloop_args = [kernel, cell_set]
 
+    if first_coeff_fake_coords:
+        # Replace with real coords coefficient
+        coefficients[0] = coords
+
     if tensor in set((c.dat for c in coefficients)):
         output = tensor
         tensor = op2.Dat(tensor.dataset)

firedrake/preconditioners/pmg.py

@@ -266,7 +266,7 @@ def prolongation_transfer_kernel_aij(Pk, P1):
     expr = TestFunction(P1)
     to_element = create_base_element(Pk.ufl_element())
 
-    ast, oriented, needs_cell_sizes, coefficients, _ = compile_expression_dual_evaluation(expr, to_element, coffee=False)
+    ast, oriented, needs_cell_sizes, coefficients, first_coeff_fake_coords, _ = compile_expression_dual_evaluation(expr, to_element, coffee=False)
     kernel = op2.Kernel(ast, ast.name)
     return kernel
 
@@ -377,7 +377,7 @@ def prolongation_transfer_kernel_action(Vf, expr):
         from tsfc import compile_expression_dual_evaluation
         from tsfc.finatinterface import create_base_element
         to_element = create_base_element(Vf.ufl_element())
-        ast, oriented, needs_cell_sizes, coefficients, _ = compile_expression_dual_evaluation(expr, to_element, coffee=False)
+        ast, oriented, needs_cell_sizes, coefficients, first_coeff_fake_coords, _ = compile_expression_dual_evaluation(expr, to_element, coffee=False)
         return op2.Kernel(ast, ast.name)
 
     def make_blas_kernels(self, Vf, Vc):