From bc92d67c2232762ff1e1b36ff2eddc94d3f1d727 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= <foss@grueninger.de>
Date: Mon, 25 Jun 2018 00:35:50 +0200
Subject: [PATCH] Fix deprecation warnings.
---
dumux/linear/amgparallelhelpers.hh | 6 ++++++
dumux/porousmediumflow/2p2c/sequential/fluxdata.hh | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/dumux/linear/amgparallelhelpers.hh b/dumux/linear/amgparallelhelpers.hh
index 20fe263a34..aac602d731 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 423c13308c..1e543eb0da 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;
--
GitLab