From fff0e0d6d10d3e35ee5452bcfb767d3da06657f8 Mon Sep 17 00:00:00 2001
From: Simon Praetorius <simon.praetorius@tu-dresden.de>
Date: Fri, 6 Dec 2019 13:38:29 +0100
Subject: [PATCH] dune 2.7 updated some preconditioners in istl such that some
precompiler files had to be fixed
---
src/amdis/linearalgebra/istl/precompiled/Preconditioners.cpp | 2 ++
src/amdis/linearalgebra/istl/precompiled/Preconditioners.hpp | 3 +++
2 files changed, 5 insertions(+)
diff --git a/src/amdis/linearalgebra/istl/precompiled/Preconditioners.cpp b/src/amdis/linearalgebra/istl/precompiled/Preconditioners.cpp
index 8d3034aa..3e453a89 100644
--- a/src/amdis/linearalgebra/istl/precompiled/Preconditioners.cpp
+++ b/src/amdis/linearalgebra/istl/precompiled/Preconditioners.cpp
@@ -7,7 +7,9 @@
namespace Dune
{
template class SeqJac<Precompiled::Matrix, Precompiled::Vector, Precompiled::Vector>;
+#if DUNE_VERSION_LT(DUNE_ISTL,2,7)
template class SeqGS<Precompiled::Matrix, Precompiled::Vector, Precompiled::Vector>;
+#endif
template class SeqSOR<Precompiled::Matrix, Precompiled::Vector, Precompiled::Vector>;
template class SeqSSOR<Precompiled::Matrix, Precompiled::Vector, Precompiled::Vector>;
template class Richardson<Precompiled::Vector, Precompiled::Vector>;
diff --git a/src/amdis/linearalgebra/istl/precompiled/Preconditioners.hpp b/src/amdis/linearalgebra/istl/precompiled/Preconditioners.hpp
index 7500a5b2..d73f3bb2 100644
--- a/src/amdis/linearalgebra/istl/precompiled/Preconditioners.hpp
+++ b/src/amdis/linearalgebra/istl/precompiled/Preconditioners.hpp
@@ -1,3 +1,4 @@
+#include <dune/common/version.hh>
#include <dune/istl/preconditioners.hh>
#include <dune/istl/novlpschwarz.hh>
#include <dune/istl/schwarz.hh>
@@ -7,7 +8,9 @@
namespace Dune
{
extern template class SeqJac<Precompiled::Matrix, Precompiled::Vector, Precompiled::Vector>;
+#if DUNE_VERSION_LT(DUNE_ISTL,2,7)
extern template class SeqGS<Precompiled::Matrix, Precompiled::Vector, Precompiled::Vector>;
+#endif
extern template class SeqSOR<Precompiled::Matrix, Precompiled::Vector, Precompiled::Vector>;
extern template class SeqSSOR<Precompiled::Matrix, Precompiled::Vector, Precompiled::Vector>;
extern template class Richardson<Precompiled::Vector, Precompiled::Vector>;
--
GitLab