From e8d163848555c4ec74843a8d762ca71495633c04 Mon Sep 17 00:00:00 2001
From: Oliver Sander <sander@igpm.rwth-aachen.de>
Date: Thu, 1 Oct 2015 17:11:52 +0200
Subject: [PATCH] Make sure the vectors x and b handed to the 'apply' method
have the correct size
This avoids strange bugs when using the setSubMatrix method: that method
automatically removes rows and columns from the matrix, and expects _the user_
to do the same for the x and b vectors.
---
dune/istl/umfpack.hh | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/dune/istl/umfpack.hh b/dune/istl/umfpack.hh
index 1e217311f..8421f77ed 100644
--- a/dune/istl/umfpack.hh
+++ b/dune/istl/umfpack.hh
@@ -314,6 +314,11 @@ namespace Dune {
*/
virtual void apply(domain_type& x, range_type& b, InverseOperatorResult& res)
{
+ if (umfpackMatrix_.N() != b.size())
+ DUNE_THROW(Dune::ISTLError, "Size of right-hand-side vector b does not match the number of matrix rows!");
+ if (umfpackMatrix_.M() != x.size())
+ DUNE_THROW(Dune::ISTLError, "Size of solution vector x does not match the number of matrix columns!");
+
double UMF_Apply_Info[UMFPACK_INFO];
Caller::solve(UMFPACK_A,
umfpackMatrix_.getColStart(),
--
GitLab