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

PI/II Loop: Switch Order of Injection/Production Branches

Browse Source 
For readability reasons.

Suggested by: [at]atgeirr
This commit is contained in:
Bård Skaflestad 2020-11-06 21:17:53 +01:00
parent c8a43b982c
commit 92589a697b
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
opm/simulators/wells/MultisegmentWell_impl.hpp
View File

@ -1243,17 +1243,17 @@ namespace Opm
setToZero(connPI); setToZero(connPI);
const auto segIx = this->segmentNumberToIndex(allConn[allPerfID].segment()); const auto segIx = this->segmentNumberToIndex(allConn[allPerfID].segment());
if (! isInjecting(fs, segIx, subsetPerfID)) { // Production or zero flow rate if (isInjecting(fs, segIx, subsetPerfID)) { // Connection injects into reservoir
if (allow_xflow || this->isProducer()) { if (this->isInjector() || allow_xflow) {
this->computeConnLevelProdInd(fs, connPICalc, mob, connPI);
}
}
else { // Connection injects into reservoir
if (allow_xflow || this->isInjector()) {
this->computeConnLevelInjInd(fs, connPICalc, mob, segIx, this->computeConnLevelInjInd(fs, connPICalc, mob, segIx,
connPI, deferred_logger); connPI, deferred_logger);
} }
} }
else { // Production or zero flow rate
if (this->isProducer() || allow_xflow) {
this->computeConnLevelProdInd(fs, connPICalc, mob, connPI);
}
}
addVector(connPI, wellPI); addVector(connPI, wellPI);

14
opm/simulators/wells/StandardWell_impl.hpp
View File

@ -2347,17 +2347,17 @@ namespace Opm
}; };
setToZero(connPI); setToZero(connPI);
if (! isInjecting(fs, subsetPerfID)) { // Production or zero flow rate if (isInjecting(fs, subsetPerfID)) { // Connection injects into reservoir
if (allow_xflow || this->isProducer()) { if (this->isInjector() || allow_xflow) {
this->computeConnLevelProdInd(fs, connPICalc, mob, connPI);
}
}
else { // Connection injects into reservoir
if (allow_xflow || this->isInjector()) {
this->computeConnLevelInjInd(fs, connPICalc, mob, this->computeConnLevelInjInd(fs, connPICalc, mob,
connPI, deferred_logger); connPI, deferred_logger);
} }
} }
else { // Production or zero flow rate
if (this->isProducer() || allow_xflow) {
this->computeConnLevelProdInd(fs, connPICalc, mob, connPI);
}
}
addVector(connPI, wellPI); addVector(connPI, wellPI);