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

Merge pull request #980 from totto82/bugfix_flowebos_density

Browse Source 
BUGFIX pass pvtnum to density in convertResults() in FlowEbos
This commit is contained in:
Tor Harald Sandve 2016-12-15 15:26:47 +01:00 committed by GitHub
commit d856510b74
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
opm/autodiff/BlackoilModelEbos.hpp
View File

@ -1390,11 +1390,13 @@ namespace Opm {
const double cellVolume = ebosSimulator_.model().dofTotalVolume(cellIdx); const double cellVolume = ebosSimulator_.model().dofTotalVolume(cellIdx);
auto& cellRes = ebosResid[ cellIdx ]; auto& cellRes = ebosResid[ cellIdx ];
unsigned pvtRegionIdx = ebosSimulator_.problem().pvtRegionIndex(cellIdx);
for( int flowPhaseIdx = 0; flowPhaseIdx < numFlowPhases; ++flowPhaseIdx ) for( int flowPhaseIdx = 0; flowPhaseIdx < numFlowPhases; ++flowPhaseIdx )
{ {
const int canonicalFlowPhaseIdx = pu.phase_pos[flowPhaseIdx]; const int canonicalFlowPhaseIdx = pu.phase_pos[flowPhaseIdx];
const int ebosPhaseIdx = flowPhaseToEbosPhaseIdx(canonicalFlowPhaseIdx); const int ebosPhaseIdx = flowPhaseToEbosPhaseIdx(canonicalFlowPhaseIdx);
const double refDens = FluidSystem::referenceDensity(ebosPhaseIdx, 0); const double refDens = FluidSystem::referenceDensity(ebosPhaseIdx, pvtRegionIdx);
cellRes[ flowPhaseToEbosCompIdx( flowPhaseIdx ) ] /= refDens; cellRes[ flowPhaseToEbosCompIdx( flowPhaseIdx ) ] /= refDens;
cellRes[ flowPhaseToEbosCompIdx( flowPhaseIdx ) ] *= cellVolume; cellRes[ flowPhaseToEbosCompIdx( flowPhaseIdx ) ] *= cellVolume;
} }
@ -1404,7 +1406,7 @@ namespace Opm {
{ {
const int rowIdx = row.index(); const int rowIdx = row.index();
const double cellVolume = ebosSimulator_.model().dofTotalVolume(rowIdx); const double cellVolume = ebosSimulator_.model().dofTotalVolume(rowIdx);
unsigned pvtRegionIdx = ebosSimulator_.problem().pvtRegionIndex(rowIdx);
// translate the Jacobian of the residual from the format used by ebos to // translate the Jacobian of the residual from the format used by ebos to
// the one expected by flow // the one expected by flow
@ -1416,7 +1418,7 @@ namespace Opm {
const int canonicalFlowPhaseIdx = pu.phase_pos[flowPhaseIdx]; const int canonicalFlowPhaseIdx = pu.phase_pos[flowPhaseIdx];
const int ebosPhaseIdx = flowPhaseToEbosPhaseIdx(canonicalFlowPhaseIdx); const int ebosPhaseIdx = flowPhaseToEbosPhaseIdx(canonicalFlowPhaseIdx);
const int ebosCompIdx = flowPhaseToEbosCompIdx(canonicalFlowPhaseIdx); const int ebosCompIdx = flowPhaseToEbosCompIdx(canonicalFlowPhaseIdx);
const double refDens = FluidSystem::referenceDensity(ebosPhaseIdx, 0); const double refDens = FluidSystem::referenceDensity(ebosPhaseIdx, pvtRegionIdx);
for( int pvIdx=0; pvIdx<numFlowPhases; ++pvIdx ) for( int pvIdx=0; pvIdx<numFlowPhases; ++pvIdx )
{ {
(*col)[ebosCompIdx][flowToEbosPvIdx(pvIdx)] /= refDens; (*col)[ebosCompIdx][flowToEbosPvIdx(pvIdx)] /= refDens;