From 596be7b97cc0bd279e7305cae9535ae6bdb66d06 Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Tue, 21 Apr 2020 11:18:52 +0000
Subject: [PATCH] Merge branch 'fix/solver-factory-dune27' into 'master'
[linear][istlsolverfactorybackend] Fix compiler error for dune-2.7 and BCRS matrices
Closes #868
See merge request dumux-repositories/dumux!2017
(cherry picked from commit c211d012451bbef2f36d567a8c7a049fc9e59a56)
dccae09f [linear][istlsolverfactorybackend] Fix compiler error for dune-2.7 and BCRS matrices
---
dumux/linear/istlsolverfactorybackend.hh | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/dumux/linear/istlsolverfactorybackend.hh b/dumux/linear/istlsolverfactorybackend.hh
index b1cc3501dd..2fda1567de 100644
--- a/dumux/linear/istlsolverfactorybackend.hh
+++ b/dumux/linear/istlsolverfactorybackend.hh
@@ -97,7 +97,15 @@ void initSolverFactories()
if constexpr (isMultiTypeBlockMatrix<Matrix>::value)
initSolverFactoriesForMultiTypeBlockMatrix<LinearOperator>();
else
+#if DUNE_VERSION_GT(DUNE_ISTL,2,7)
Dune::initSolverFactories<LinearOperator>();
+#else
+ {
+ using X = typename LinearOperator::range_type;
+ using Y = typename LinearOperator::domain_type;
+ Dune::initSolverFactories<Matrix, X, Y>();
+ }
+#endif
}
/*!
--
GitLab