OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Avoid shared pointe for MaterialLawManager

Browse Source
This commit is contained in:
Tor Harald Sandve 2017-11-21 13:28:49 +01:00
parent 5a9123c1b1
commit 2070247244
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ebos/eclequilinitializer.hh
View File

@ -117,16 +117,15 @@ public:
equilCartesianToCompressed[ equilCartesianIdx ] = equilElemIdx; equilCartesianToCompressed[ equilCartesianIdx ] = equilElemIdx;
} }
auto equilMaterialLawManager = Opm::EclMaterialLawManager<EquilTraits> equilMaterialLawManager =
std::make_shared<Opm::EclMaterialLawManager<EquilTraits> >(); Opm::EclMaterialLawManager<EquilTraits>();
equilMaterialLawManager->initFromDeck(deck, eclState, compressedToCartesianEquilElemIdx); equilMaterialLawManager.initFromDeck(deck, eclState, compressedToCartesianEquilElemIdx);
Opm::EQUIL::DeckDependent::InitialStateComputer<FluidSystem> initialState(equilMaterialLawManager, Opm::EQUIL::DeckDependent::InitialStateComputer<FluidSystem> initialState(equilMaterialLawManager,
gridManager.eclState(), gridManager.eclState(),
equilGrid, equilGrid,
simulator.problem().gravity()[dimWorld - 1], simulator.problem().gravity()[dimWorld - 1],
enableSwatinit); enableSwatinit);
std::vector<int> localToEquilIndex( numElems, -1 ); std::vector<int> localToEquilIndex( numElems, -1 );
@ -213,7 +212,7 @@ public:
// requested to be applied. this is quite hacky but hey it works! // requested to be applied. this is quite hacky but hey it works!
if (enableSwatinit) { if (enableSwatinit) {
const auto& equilScalingPoints = const auto& equilScalingPoints =
equilMaterialLawManager->oilWaterScaledEpsPointsDrainage(equilElemIdx); equilMaterialLawManager.oilWaterScaledEpsPointsDrainage(equilElemIdx);
auto& scalingPoints = auto& scalingPoints =
materialLawManager.oilWaterScaledEpsPointsDrainage(elemIdx); materialLawManager.oilWaterScaledEpsPointsDrainage(elemIdx);
scalingPoints.setMaxPcnw(equilScalingPoints.maxPcnw()); scalingPoints.setMaxPcnw(equilScalingPoints.maxPcnw());