ebos: get rid of some Dune 2.4 deprecation warnings

they haven't been noticed yet because CpGrid does not feature them.
This commit is contained in:
Andreas Lauser
2015-06-14 21:31:39 +02:00
parent c41f642414
commit aab270e5b5
2 changed files with 6 additions and 2 deletions

View File

@@ -319,7 +319,11 @@ public:
///////////// /////////////
// influence of grid on well // influence of grid on well
auto &curBlock = matrix[wellGlobalDofIdx][gridDofIdx]; auto &curBlock = matrix[wellGlobalDofIdx][gridDofIdx];
#if DUNE_VERSION_NEWER(DUNE_COMMON, 2,4)
elemCtx.updateStencil(*dofVars.elementPtr);
#else
elemCtx.updateStencil(*(*dofVars.elementPtr)); elemCtx.updateStencil(*(*dofVars.elementPtr));
#endif
curBlock = 0.0; curBlock = 0.0;
for (int priVarIdx = 0; priVarIdx < numModelEq; ++priVarIdx) { for (int priVarIdx = 0; priVarIdx < numModelEq; ++priVarIdx) {
// calculate the derivative of the well equation w.r.t. the current // calculate the derivative of the well equation w.r.t. the current

View File

@@ -170,8 +170,8 @@ public:
const auto& inside = intersection.inside(); const auto& inside = intersection.inside();
const auto& outside = intersection.outside(); const auto& outside = intersection.outside();
#if DUNE_VERSION_NEWER(DUNE_COMMON, 2,4) #if DUNE_VERSION_NEWER(DUNE_COMMON, 2,4)
int insideElemIdx = elementMapper.index(*inside); int insideElemIdx = elementMapper.index(inside);
int outsideElemIdx = elementMapper.index(*outside); int outsideElemIdx = elementMapper.index(outside);
#else #else
int insideElemIdx = elementMapper.map(*inside); int insideElemIdx = elementMapper.map(*inside);
int outsideElemIdx = elementMapper.map(*outside); int outsideElemIdx = elementMapper.map(*outside);