diff --git a/dumux/linear/amgparallelhelpers.hh b/dumux/linear/amgparallelhelpers.hh index 20fe263a340be417b6e506c80c15a257a2818199..aac602d7311a5ef66e08136056b783a525cc6924 100644 --- a/dumux/linear/amgparallelhelpers.hh +++ b/dumux/linear/amgparallelhelpers.hh @@ -25,6 +25,7 @@ #ifndef DUMUX_AMGPARALLELHELPERS_HH #define DUMUX_AMGPARALLELHELPERS_HH +#include <dune/common/version.hh> #include <dune/geometry/dimension.hh> #include <dune/grid/common/datahandleif.hh> #include <dune/grid/common/partitionset.hh> @@ -956,8 +957,13 @@ void ParallelISTLHelper<GridView, AmgTraits>::createIndexSetAndProjectForAMG(Mat // This dof is managed by us. attr = Dune::OwnerOverlapCopyAttributeSet::owner; } +#if DUNE_VERSION_GTE(DUNE_ISTL, 2, 7) + else if ( *ghost==(1<<24) && ( comm.category() == + static_cast<int>(Dune::SolverCategory::nonoverlapping)) ) +#else else if ( *ghost==(1<<24) && ( comm.getSolverCategory() == static_cast<int>(Dune::SolverCategory::nonoverlapping)) ) +#endif { //use attribute overlap for ghosts in novlp grids attr = Dune::OwnerOverlapCopyAttributeSet::overlap; diff --git a/dumux/porousmediumflow/2p2c/sequential/fluxdata.hh b/dumux/porousmediumflow/2p2c/sequential/fluxdata.hh index 423c13308cbd00c7bdf899008bd43f0d19834868..1e543eb0dac644c7f48ead163813f24a31c1bd21 100644 --- a/dumux/porousmediumflow/2p2c/sequential/fluxdata.hh +++ b/dumux/porousmediumflow/2p2c/sequential/fluxdata.hh @@ -78,7 +78,7 @@ public: //! Constructor FluxData2P2C() { - isUpwindCell_.resize(2*dim, 0.0); + isUpwindCell_.resize(2*dim); for (int phaseIdx = 0; phaseIdx < numPhases; ++phaseIdx) for (int fIdx = 0; fIdx < 2*dim; ++fIdx) velocity_[phaseIdx][fIdx] = 0.0;