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

Prevent using dangling references in BlackoilModelEbos::updateState.

Browse Source 
Using cachedIntensiveQuantities on parallel grids will cause/is causing
dereferencing a null pointer here. Therefore we resort to iterating over
the grid and using the element Context.

If this turns out ot be performance regression @andlaus owes me a beer!

Closes #1110
This commit is contained in:
Markus Blatt 2017-03-20 16:35:46 +01:00
parent 0b0ef7e20f
commit aa5940a2ff
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
opm/autodiff/BlackoilModelEbos.hpp
View File

@ -586,7 +586,17 @@ namespace Opm {
const int np = fluid_.numPhases(); const int np = fluid_.numPhases();
const int nc = numCells(grid_); const int nc = numCells(grid_);
for (int cell_idx = 0; cell_idx < nc; ++cell_idx) { ElementContext elemCtx(ebosSimulator_);
const auto& gridView = grid_.leafGridView();
const auto& elemEndIt = gridView.template end</*codim=*/0>();
for (auto elemIt = gridView.template begin</*codim=*/0>();
elemIt != elemEndIt;
++elemIt)
{
const auto& elem = *elemIt;
elemCtx.updatePrimaryStencil(elem);
elemCtx.updatePrimaryIntensiveQuantities(/*timeIdx=*/0);
const unsigned cell_idx = elemCtx.globalSpaceIndex(/*spaceIdx=*/0, /*timeIdx=*/0);
const double& dp = dx[cell_idx][flowPhaseToEbosCompIdx(0)]; const double& dp = dx[cell_idx][flowPhaseToEbosCompIdx(0)];
//reservoir_state.pressure()[cell_idx] -= dp; //reservoir_state.pressure()[cell_idx] -= dp;
double& p = reservoir_state.pressure()[cell_idx]; double& p = reservoir_state.pressure()[cell_idx];
@ -668,7 +678,7 @@ namespace Opm {
// phase translation sg <-> rs // phase translation sg <-> rs
const HydroCarbonState hydroCarbonState = reservoir_state.hydroCarbonState()[cell_idx]; const HydroCarbonState hydroCarbonState = reservoir_state.hydroCarbonState()[cell_idx];
const auto& intQuants = *(ebosSimulator_.model().cachedIntensiveQuantities(cell_idx, /*timeIdx=*/0)); const auto& intQuants = elemCtx.intensiveQuantities(/*spaceIdx=*/0, /*timeIdx=*/0);
const auto& fs = intQuants.fluidState(); const auto& fs = intQuants.fluidState();
switch (hydroCarbonState) { switch (hydroCarbonState) {
case HydroCarbonState::GasAndOil: { case HydroCarbonState::GasAndOil: {