From 9ccd4be5e3d79194a80f655e5063a17c7e7b56b0 Mon Sep 17 00:00:00 2001 From: Markus Blatt Date: Sun, 8 Mar 2020 16:25:35 +0100 Subject: [PATCH] Shrink EclEquilInitializer::initialFluidStates_. There is not reason to it as a vector of cartesian size as we access its entries by the compressed element index. This should save space and speedup the lookup. --- ebos/eclequilinitializer.hh | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/ebos/eclequilinitializer.hh b/ebos/eclequilinitializer.hh index dfdf986c2..73259e197 100644 --- a/ebos/eclequilinitializer.hh +++ b/ebos/eclequilinitializer.hh @@ -109,7 +109,6 @@ public: const auto& eclState = vanguard.eclState(); unsigned numElems = vanguard.grid().size(0); - unsigned numCartesianElems = vanguard.cartesianSize(); EQUIL::DeckDependent::InitialStateComputer initialState(materialLawManager, eclState, @@ -117,10 +116,9 @@ public: simulator.problem().gravity()[dimWorld - 1]); // copy the result into the array of initial fluid states - initialFluidStates_.resize(numCartesianElems); + initialFluidStates_.resize(numElems); for (unsigned int elemIdx = 0; elemIdx < numElems; ++elemIdx) { - unsigned cartesianElemIdx = vanguard.cartesianIndex(elemIdx); - auto& fluidState = initialFluidStates_[cartesianElemIdx]; + auto& fluidState = initialFluidStates_[elemIdx]; // get the PVT region index of the current element unsigned regionIdx = simulator_.problem().pvtRegionIndex(elemIdx); @@ -173,10 +171,7 @@ public: */ const ScalarFluidState& initialFluidState(unsigned elemIdx) const { - const auto& vanguard = simulator_.vanguard(); - - unsigned cartesianElemIdx = vanguard.cartesianIndex(elemIdx); - return initialFluidStates_[cartesianElemIdx]; + return initialFluidStates_[elemIdx]; } protected: