From fd26efa14060a3f99876d12a8c61de9c0c5c6606 Mon Sep 17 00:00:00 2001 From: Andreas Lauser Date: Thu, 6 Aug 2015 17:01:58 +0200 Subject: [PATCH] ebos: adapt to the Cartesian -> compressed cells change of EclMaterialLawManager --- applications/ebos/eclproblem.hh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/applications/ebos/eclproblem.hh b/applications/ebos/eclproblem.hh index 0a68c9b4e..03173f918 100644 --- a/applications/ebos/eclproblem.hh +++ b/applications/ebos/eclproblem.hh @@ -792,7 +792,11 @@ private: } // the fluid-matrix interactions for ECL problems are dealt with by a separate class - materialLawManager_.initFromDeck(deck, eclState); + std::vector compressedToCartesianElemIdx(numDof); + for (unsigned elemIdx = 0; elemIdx < numDof; ++elemIdx) + compressedToCartesianElemIdx[elemIdx] = gridManager.cartesianCellId(elemIdx); + + materialLawManager_.initFromDeck(deck, eclState, compressedToCartesianElemIdx); } void initFluidSystem_() @@ -1129,9 +1133,7 @@ private: const MaterialLawParams& materialLawParams_(int globalDofIdx) const { - int cartesianCellIdx = this->simulator().gridManager().cartesianCellId(globalDofIdx); - - return materialLawManager_.materialLawParams(cartesianCellIdx); + return materialLawManager_.materialLawParams(globalDofIdx); } // update the hysteresis parameters of the material laws for the whole grid