Merge pull request #2958 from blattms/use-perf-data-for-well-pi

Use WellInterface::perf_data_ to calculate PI.
This commit is contained in:
Bård Skaflestad 2020-12-01 17:37:05 +01:00 committed by GitHub
commit bb2f1a8316
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 14 deletions

View File

@ -1210,14 +1210,10 @@ namespace Opm
setToZero(wellPI);
const auto preferred_phase = this->well_ecl_.getPreferredPhase();
auto subsetPerfID = 0;
const auto& allConn = this->well_ecl_.getConnections();
const auto nPerf = allConn.size();
auto subsetPerfID = 0*nPerf;
for (auto allPerfID = 0*nPerf; allPerfID < nPerf; ++allPerfID) {
if (allConn[allPerfID].state() == Connection::State::SHUT) {
continue;
}
for ( const auto& perf : *this->perf_data_){
auto allPerfID = perf.ecl_index;
auto connPICalc = [&wellPICalc, allPerfID](const double mobility) -> double
{

View File

@ -2316,14 +2316,10 @@ namespace Opm
setToZero(wellPI);
const auto preferred_phase = this->well_ecl_.getPreferredPhase();
auto subsetPerfID = 0;
const auto& allConn = this->well_ecl_.getConnections();
const auto nPerf = allConn.size();
auto subsetPerfID = 0*nPerf;
for (auto allPerfID = 0*nPerf; allPerfID < nPerf; ++allPerfID) {
if (allConn[allPerfID].state() == Connection::State::SHUT) {
continue;
}
for ( const auto& perf : *this->perf_data_){
auto allPerfID = perf.ecl_index;
auto connPICalc = [&wellPICalc, allPerfID](const double mobility) -> double
{