Merge pull request #1892 from akva2/fix_flexible_no_mpi

fixed: build with dune 2.6 without MPI
This commit is contained in:
Atgeirr Flø Rasmussen 2019-06-19 10:08:25 +02:00 committed by GitHub
commit e4ef759d97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -74,7 +74,6 @@ public:
explicit ISTLSolverEbosFlexible(const Simulator& simulator)
: simulator_(simulator)
, comm_(nullptr)
{
parameters_.template init<TypeTag>();
prm_ = setupPropertyTree(parameters_);
@ -133,7 +132,9 @@ public:
if (recreate_solver || !solver_) {
if (isParallel()) {
#if HAVE_MPI
solver_.reset(new SolverType(prm_, mat.istlMatrix(), *comm_));
#endif
} else {
solver_.reset(new SolverType(prm_, mat.istlMatrix()));
}
@ -209,7 +210,9 @@ protected:
VectorType rhs_;
Dune::InverseOperatorResult res_;
boost::any parallelInformation_;
#if HAVE_MPI
std::unique_ptr<Communication> comm_;
#endif
std::vector<std::pair<int, std::vector<int>>> overlapRowAndColumns_;
}; // end ISTLSolverEbosFlexible