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

Reflect changes in parser api, removed shared_ptr

Browse Source
This commit is contained in:
Pål Grønås Drange 2016-08-09 08:33:06 +02:00
parent 6e9b13ad5a
commit 461f3bba1a
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
applications/ebos/eclthresholdpressure.hh
View File

@ -101,9 +101,9 @@ public:
const auto& gridManager = simulator_.gridManager(); const auto& gridManager = simulator_.gridManager();
Opm::EclipseStateConstPtr eclState = gridManager.eclState(); Opm::EclipseStateConstPtr eclState = gridManager.eclState();
Opm::SimulationConfigConstPtr simConfig = eclState->getSimulationConfig(); const auto& simConfig = eclState->getSimulationConfig();
enableThresholdPressure_ = simConfig->hasThresholdPressure(); enableThresholdPressure_ = simConfig.hasThresholdPressure();
if (!enableThresholdPressure_) if (!enableThresholdPressure_)
return; return;

12
applications/ebos/ecltransmissibility.hh
View File

@ -98,7 +98,7 @@ public:
const auto& cartMapper = gridManager.cartesianIndexMapper(); const auto& cartMapper = gridManager.cartesianIndexMapper();
const auto eclState = gridManager.eclState(); const auto eclState = gridManager.eclState();
const auto eclGrid = eclState->getInputGrid(); const auto eclGrid = eclState->getInputGrid();
const auto transMult = eclState->getTransMult(); const auto& transMult = eclState->getTransMult();
const std::vector<double>& ntg = const std::vector<double>& ntg =
eclState->get3DProperties().getDoubleGridProperty("NTG").getData(); eclState->get3DProperties().getDoubleGridProperty("NTG").getData();
@ -214,9 +214,9 @@ public:
// apply the full face transmissibility multipliers // apply the full face transmissibility multipliers
// for the inside ... // for the inside ...
applyMultipliers_(trans, insideFaceIdx, insideCartElemIdx, *transMult); applyMultipliers_(trans, insideFaceIdx, insideCartElemIdx, transMult);
// ... and outside elements // ... and outside elements
applyMultipliers_(trans, outsideFaceIdx, outsideCartElemIdx, *transMult); applyMultipliers_(trans, outsideFaceIdx, outsideCartElemIdx, transMult);
// apply the region multipliers (cf. the MULTREGT keyword) // apply the region multipliers (cf. the MULTREGT keyword)
Opm::FaceDir::DirEnum faceDir; Opm::FaceDir::DirEnum faceDir;
@ -240,9 +240,9 @@ public:
OPM_THROW(std::logic_error, "Could not determine a face direction"); OPM_THROW(std::logic_error, "Could not determine a face direction");
} }
trans *= transMult->getRegionMultiplier(insideCartElemIdx, trans *= transMult.getRegionMultiplier(insideCartElemIdx,
outsideCartElemIdx, outsideCartElemIdx,
faceDir); faceDir);
trans_[isId_(insideElemIdx, outsideElemIdx)] = trans; trans_[isId_(insideElemIdx, outsideElemIdx)] = trans;
} }