no annotation for adj_sol buffer creation, and test warning fixes

Author: JHopeCollins

firedrake/adjoint_utils/blocks/solving.py

@@ -56,7 +56,7 @@ def __init__(self, lhs, rhs, func, bcs, *args, **kwargs):
         # Solution function
         self.func = func
         self.function_space = self.func.function_space()
-        self.adj_state_buf = self.func.copy(deepcopy=True)
+        self.adj_state_buf = self.func.copy(deepcopy=True, annotate=False)
         # Boundary conditions
         self.bcs = []
         if bcs is not None:

tests/firedrake/regression/test_adjoint_operators.py

@@ -124,7 +124,7 @@ def test_interpolate_vector_valued():
     J = assemble(inner(f, g)*u**2*dx)
     rf = ReducedFunctional(J, Control(f))
 
-    h = Function(V1).assign(1)
+    h = Function(V1).assign(1.)
     assert taylor_test(rf, f, h) > 1.9
 
 
@@ -144,7 +144,7 @@ def test_interpolate_tlm():
     J = assemble(inner(f, g)*u**2*dx)
     rf = ReducedFunctional(J, Control(f))
 
-    h = Function(V1).assign(1)
+    h = Function(V1).assign(1.)
     f.block_variable.tlm_value = h
 
     tape = get_working_tape()
@@ -259,7 +259,7 @@ def test_interpolate_to_function_space_cross_mesh():
     mesh_src = UnitSquareMesh(2, 2)
     mesh_dest = UnitSquareMesh(3, 3, quadrilateral=True)
     V = FunctionSpace(mesh_src, "CG", 1)
-    W = FunctionSpace(mesh_dest, "DG", 1)
+    W = FunctionSpace(mesh_dest, "DQ", 1)
     R = FunctionSpace(mesh_src, "R", 0)
     u = Function(V)
 
@@ -290,7 +290,7 @@ def test_interpolate_hessian_linear_expr(rg):
     # space h and perterbation direction g.
     W = FunctionSpace(mesh, "Lagrange", 2)
     R = FunctionSpace(mesh, "R", 0)
-    f = Function(W).assign(5)
+    f = Function(W).assign(5.)
     # Note that we interpolate from a linear expression
     expr_interped = Function(V).interpolate(2*f)
 
@@ -345,7 +345,7 @@ def test_interpolate_hessian_nonlinear_expr(rg):
     # space h and perterbation direction g.
     W = FunctionSpace(mesh, "Lagrange", 2)
     R = FunctionSpace(mesh, "R", 0)
-    f = Function(W).assign(5)
+    f = Function(W).assign(5.)
     # Note that we interpolate from a nonlinear expression
     expr_interped = Function(V).interpolate(f**2)
 
@@ -400,8 +400,8 @@ def test_interpolate_hessian_nonlinear_expr_multi(rg):
     # space h and perterbation direction g.
     W = FunctionSpace(mesh, "Lagrange", 2)
     R = FunctionSpace(mesh, "R", 0)
-    f = Function(W).assign(5)
-    w = Function(W).assign(4)
+    f = Function(W).assign(5.)
+    w = Function(W).assign(4.)
     c = Function(R, val=2.0)
     # Note that we interpolate from a nonlinear expression with 3 coefficients
     expr_interped = Function(V).interpolate(f**2+w**2+c**2)
@@ -460,8 +460,8 @@ def test_interpolate_hessian_nonlinear_expr_multi_cross_mesh(rg):
     mesh_src = UnitSquareMesh(11, 11)
     R_src = FunctionSpace(mesh_src, "R", 0)
     W = FunctionSpace(mesh_src, "Lagrange", 2)
-    f = Function(W).assign(5)
-    w = Function(W).assign(4)
+    f = Function(W).assign(5.)
+    w = Function(W).assign(4.)
     c = Function(R_src, val=2.0)
     # Note that we interpolate from a nonlinear expression with 3 coefficients
     expr_interped = Function(V).interpolate(f**2+w**2+c**2)
@@ -1035,8 +1035,9 @@ def u_analytical(x, a, b):
     tape = get_working_tape()
     # Check the checkpointed boundary conditions are not updating the
     # user-defined boundary conditions ``bc_left`` and ``bc_right``.
-    assert isinstance(tape._blocks[0], DirichletBCBlock) and \
-        tape._blocks[0]._outputs[0].checkpoint.checkpoint is not bc_left._original_arg
+    assert isinstance(tape._blocks[0], DirichletBCBlock)
+    assert tape._blocks[0]._outputs[0].checkpoint.checkpoint is not bc_left._original_arg
+
     # tape._blocks[1] is the DirichletBC block for the right boundary
-    assert isinstance(tape._blocks[1], DirichletBCBlock) and \
-        tape._blocks[1]._outputs[0].checkpoint.checkpoint is not bc_right._original_arg
+    assert isinstance(tape._blocks[1], DirichletBCBlock)
+    assert tape._blocks[1]._outputs[0].checkpoint.checkpoint is not bc_right._original_arg