From aab270e5b5c75fadf657f266932ae675ebbc5a6b Mon Sep 17 00:00:00 2001 From: Andreas Lauser Date: Sun, 14 Jun 2015 21:31:39 +0200 Subject: [PATCH] ebos: get rid of some Dune 2.4 deprecation warnings they haven't been noticed yet because CpGrid does not feature them. --- applications/ebos/eclpeacemanwell.hh | 4 ++++ applications/ebos/ecltransmissibility.hh | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/applications/ebos/eclpeacemanwell.hh b/applications/ebos/eclpeacemanwell.hh index a165dd55c..38f2c4a7e 100644 --- a/applications/ebos/eclpeacemanwell.hh +++ b/applications/ebos/eclpeacemanwell.hh @@ -319,7 +319,11 @@ public: ///////////// // influence of grid on well auto &curBlock = matrix[wellGlobalDofIdx][gridDofIdx]; +#if DUNE_VERSION_NEWER(DUNE_COMMON, 2,4) + elemCtx.updateStencil(*dofVars.elementPtr); +#else elemCtx.updateStencil(*(*dofVars.elementPtr)); +#endif curBlock = 0.0; for (int priVarIdx = 0; priVarIdx < numModelEq; ++priVarIdx) { // calculate the derivative of the well equation w.r.t. the current diff --git a/applications/ebos/ecltransmissibility.hh b/applications/ebos/ecltransmissibility.hh index d4a3d29c0..a8b38f72e 100644 --- a/applications/ebos/ecltransmissibility.hh +++ b/applications/ebos/ecltransmissibility.hh @@ -170,8 +170,8 @@ public: const auto& inside = intersection.inside(); const auto& outside = intersection.outside(); #if DUNE_VERSION_NEWER(DUNE_COMMON, 2,4) - int insideElemIdx = elementMapper.index(*inside); - int outsideElemIdx = elementMapper.index(*outside); + int insideElemIdx = elementMapper.index(inside); + int outsideElemIdx = elementMapper.index(outside); #else int insideElemIdx = elementMapper.map(*inside); int outsideElemIdx = elementMapper.map(*outside);