Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions firedrake/solving.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import ufl

import firedrake.linear_solver as ls
from firedrake.matrix import MatrixBase
import firedrake.variational_solver as vs
from firedrake.function import Function
from firedrake.adjoint_utils import annotate_solve
Expand Down Expand Up @@ -164,7 +163,10 @@ def _solve_varproblem(*args, **kwargs):
form_compiler_parameters['scalar_type'] = ScalarType

appctx = kwargs.get("appctx", {})
if isinstance(eq.lhs, (ufl.Form, MatrixBase)) and isinstance(eq.rhs, ufl.BaseForm):
if not isinstance(eq.lhs, ufl.BaseForm):
raise TypeError(f"Equation LHS must be a ufl.BaseForm, not a {type(eq.lhs).__name__}")

if len(eq.lhs.arguments()) == 2:
# Create linear variational problem
problem = vs.LinearVariationalProblem(eq.lhs, eq.rhs, u, bcs, Jp,
form_compiler_parameters=form_compiler_parameters,
Expand All @@ -173,7 +175,7 @@ def _solve_varproblem(*args, **kwargs):
else:
# Create nonlinear variational problem
if eq.rhs != 0:
raise TypeError("Only '0' support on RHS of nonlinear Equation, not %r" % eq.rhs)
raise ValueError(f"RHS of nonlinear Equation must be `0`, not {eq.rhs}")
problem = vs.NonlinearVariationalProblem(eq.lhs, u, bcs, J, Jp,
form_compiler_parameters=form_compiler_parameters,
restrict=restrict)
Expand Down
8 changes: 8 additions & 0 deletions tests/firedrake/regression/test_solving_interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,14 @@ def test_assembled_solver_gced(a_L_out):
assert before == after


def test_linear_solve_zero_rhs(a_L_out):
a, L, out = a_L_out

out.assign(1)
solve(a == 0, out)
assert np_norm(out.dat.data_ro) < 1E-13


def test_nonlinear_solver_gced(a_L_out):
a, L, out = a_L_out

Expand Down
Loading