ebos: replace the opm-parser related pointers/smart pointers by references

this seems to be the spirit of the season. note that now the deck
object must be copied, but I suppose that copying it is pretty cheap.
This commit is contained in:
Andreas Lauser
2016-12-07 20:24:48 +01:00
parent 9460177f17
commit 36c010c956
8 changed files with 78 additions and 95 deletions
+5 -5
View File
@@ -118,13 +118,13 @@ public:
auto equilMaterialLawManager =
std::make_shared<Opm::EclMaterialLawManager<EquilTraits> >();
equilMaterialLawManager->initFromDeck(*deck, *eclState, compressedToCartesianEquilElemIdx);
equilMaterialLawManager->initFromDeck(deck, eclState, compressedToCartesianEquilElemIdx);
// create the data structures which are used by initStateEquil()
Opm::parameter::ParameterGroup tmpParam;
Opm::BlackoilPropertiesFromDeck opmBlackoilProps(
*gridManager.deck(),
*gridManager.eclState(),
gridManager.deck(),
gridManager.eclState(),
equilMaterialLawManager,
Opm::UgGridHelpers::numCells(equilGrid),
Opm::UgGridHelpers::globalCell(equilGrid),
@@ -140,8 +140,8 @@ public:
// do the actual computation.
Opm::initStateEquil(equilGrid,
opmBlackoilProps,
*gridManager.deck(),
*gridManager.eclState(),
gridManager.deck(),
gridManager.eclState(),
simulator.problem().gravity()[dimWorld - 1],
opmBlackoilState);