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

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

View File

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

View File

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