Commit e76b32e2 authored by Praetorius, Simon's avatar Praetorius, Simon
Browse files

Merge branch 'issue/updated_dune_2-7' into 'master'

dune 2.7 updated some preconditioners in istl such that some precompiler files had to be fixed

See merge request !119
parents 89eee3ae fff0e0d6
...@@ -7,7 +7,9 @@ ...@@ -7,7 +7,9 @@
namespace Dune namespace Dune
{ {
template class SeqJac<Precompiled::Matrix, Precompiled::Vector, Precompiled::Vector>; 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>; template class SeqGS<Precompiled::Matrix, Precompiled::Vector, Precompiled::Vector>;
#endif
template class SeqSOR<Precompiled::Matrix, Precompiled::Vector, Precompiled::Vector>; template class SeqSOR<Precompiled::Matrix, Precompiled::Vector, Precompiled::Vector>;
template class SeqSSOR<Precompiled::Matrix, Precompiled::Vector, Precompiled::Vector>; template class SeqSSOR<Precompiled::Matrix, Precompiled::Vector, Precompiled::Vector>;
template class Richardson<Precompiled::Vector, Precompiled::Vector>; template class Richardson<Precompiled::Vector, Precompiled::Vector>;
......
#include <dune/common/version.hh>
#include <dune/istl/preconditioners.hh> #include <dune/istl/preconditioners.hh>
#include <dune/istl/novlpschwarz.hh> #include <dune/istl/novlpschwarz.hh>
#include <dune/istl/schwarz.hh> #include <dune/istl/schwarz.hh>
...@@ -7,7 +8,9 @@ ...@@ -7,7 +8,9 @@
namespace Dune namespace Dune
{ {
extern template class SeqJac<Precompiled::Matrix, Precompiled::Vector, Precompiled::Vector>; 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>; extern template class SeqGS<Precompiled::Matrix, Precompiled::Vector, Precompiled::Vector>;
#endif
extern template class SeqSOR<Precompiled::Matrix, Precompiled::Vector, Precompiled::Vector>; extern template class SeqSOR<Precompiled::Matrix, Precompiled::Vector, Precompiled::Vector>;
extern template class SeqSSOR<Precompiled::Matrix, Precompiled::Vector, Precompiled::Vector>; extern template class SeqSSOR<Precompiled::Matrix, Precompiled::Vector, Precompiled::Vector>;
extern template class Richardson<Precompiled::Vector, Precompiled::Vector>; extern template class Richardson<Precompiled::Vector, Precompiled::Vector>;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment