From 2070247244ef8ce264ab0627e13065065a6486b4 Mon Sep 17 00:00:00 2001 From: Tor Harald Sandve Date: Tue, 21 Nov 2017 13:28:49 +0100 Subject: [PATCH] Avoid shared pointe for MaterialLawManager --- ebos/eclequilinitializer.hh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/ebos/eclequilinitializer.hh b/ebos/eclequilinitializer.hh index 3a9fe0572..39b070684 100644 --- a/ebos/eclequilinitializer.hh +++ b/ebos/eclequilinitializer.hh @@ -117,16 +117,15 @@ public: equilCartesianToCompressed[ equilCartesianIdx ] = equilElemIdx; } - auto equilMaterialLawManager = - std::make_shared >(); - equilMaterialLawManager->initFromDeck(deck, eclState, compressedToCartesianEquilElemIdx); - + Opm::EclMaterialLawManager equilMaterialLawManager = + Opm::EclMaterialLawManager(); + equilMaterialLawManager.initFromDeck(deck, eclState, compressedToCartesianEquilElemIdx); Opm::EQUIL::DeckDependent::InitialStateComputer initialState(equilMaterialLawManager, gridManager.eclState(), equilGrid, simulator.problem().gravity()[dimWorld - 1], - enableSwatinit); + enableSwatinit); std::vector localToEquilIndex( numElems, -1 ); @@ -213,7 +212,7 @@ public: // requested to be applied. this is quite hacky but hey it works! if (enableSwatinit) { const auto& equilScalingPoints = - equilMaterialLawManager->oilWaterScaledEpsPointsDrainage(equilElemIdx); + equilMaterialLawManager.oilWaterScaledEpsPointsDrainage(equilElemIdx); auto& scalingPoints = materialLawManager.oilWaterScaledEpsPointsDrainage(elemIdx); scalingPoints.setMaxPcnw(equilScalingPoints.maxPcnw());