add a test

Author: pbrubeck

firedrake/ufl_expr.py

@@ -301,7 +301,7 @@ def action(form, coefficient, derivatives_expanded=None):
     if isinstance(form, firedrake.slate.TensorBase):
         if form.rank == 0:
             raise ValueError("Can't take action of rank-0 tensor")
-        return form * firedrake.AssembledVector(coefficient)
+        return form * coefficient
     else:
         return ufl.action(form, coefficient, derivatives_expanded=derivatives_expanded)
 

tests/firedrake/slate/test_assemble_tensors.py

@@ -130,24 +130,6 @@ def test_assemble_matrix(rank_two_tensor):
     assert np.allclose(M.M.values, assemble(rank_two_tensor.form).M.values, rtol=1e-14)
 
 
-def test_assemble_solve(mesh):
-    V = FunctionSpace(mesh, "DG", 0)
-    u = TrialFunction(V)
-    v = TestFunction(V)
-
-    M = inner(u, v)*dx
-    f = Cofunction(V.dual())
-    f.dat.data[...] = 1
-
-    u1 = Function(V)
-    u2 = Function(V)
-    # Assemble a SLATE tensor into u1
-    assemble(Inverse(Tensor(M)) * AssembledVector(f), tensor=u1)
-    # Solve in the usual way
-    solve(M == f, u2)
-    assert np.allclose(u1.dat.data, u2.dat.data, rtol=1e-14)
-
-
 def test_assemble_vector_into_tensor(mesh):
     V = FunctionSpace(mesh, "DG", 1)
     v = TestFunction(V)

tests/firedrake/slate/test_linear_algebra.py

@@ -116,3 +116,37 @@ def test_local_solve(decomp):
     x = assemble(A.solve(b, decomposition=decomp))
 
     assert np.allclose(x.dat.data, f.dat.data, rtol=1.e-13)
+
+
+@pytest.mark.parametrize("mat_type, rhs_type", [
+    ("slate", "slate"), ("slate", "form"), ("slate", "cofunction"),
+    ("aij", "cofunction"), ("aij", "form"),
+    ("matfree", "cofunction"), ("matfree", "form")])
+def test_inverse_action(mat_type, rhs_type):
+    """Test combined UFL/SLATE expressions
+    """
+    mesh = UnitSquareMesh(3, 3)
+    V = FunctionSpace(mesh, "DG", 1)
+    u = TrialFunction(V)
+    v = TestFunction(V)
+
+    A = Tensor(inner(u, v)*dx)
+    if mat_type == "slate":
+        Ainv = A.inv
+    else:
+        Ainv = assemble(A.inv, mat_type=mat_type)
+
+    f = Function(V).assign(1.0)
+    L = inner(f, v)*dx
+    if rhs_type == "form":
+        b = L
+    elif rhs_type == "cofunction":
+        b = assemble(L)
+    elif rhs_type == "slate":
+        b = Tensor(L)
+    else:
+        raise ValueError("Invalid rhs type")
+
+    x = Function(V)
+    assemble(action(Ainv, b), tensor=x)
+    assert np.allclose(x.dat.data, f.dat.data, rtol=1.e-13)