Merge pull request #3168 from joakim-hove/simplify-global-is-grup

Simplify global is grup
This commit is contained in:
Tor Harald Sandve 2021-04-21 14:49:13 +02:00 committed by GitHub
commit 3445f2e03a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1218,10 +1218,10 @@ namespace Opm
{
std::fill(globalIsInjectionGrup_.begin(), globalIsInjectionGrup_.end(), 0);
std::fill(globalIsProductionGrup_.begin(), globalIsProductionGrup_.end(), 0);
int global_well_index = 0;
const auto& end = wellMap().end();
for (const auto& well : schedule.getWells(reportStepIdx)) {
// Build global name->index map.
auto global_well_index = well.seqIndex();
wellNameToGlobalIdx_[well.name()] = global_well_index;
// For wells on this process...
@ -1229,14 +1229,7 @@ namespace Opm
if (it != end) {
// ... set the GRUP/not GRUP states.
const int well_index = it->second[0];
if (this->status_[well_index] != Well::Status::OPEN) {
// Well is shut.
if (well.isInjector()) {
globalIsInjectionGrup_[global_well_index] = 0;
} else {
globalIsProductionGrup_[global_well_index] = 0;
}
} else {
if (this->status_[well_index] == Well::Status::OPEN) {
if (well.isInjector()) {
globalIsInjectionGrup_[global_well_index] = (currentInjectionControls()[well_index] == Well::InjectorCMode::GRUP);
} else {
@ -1244,7 +1237,6 @@ namespace Opm
}
}
}
++global_well_index;
}
comm.sum(globalIsInjectionGrup_.data(), globalIsInjectionGrup_.size());
comm.sum(globalIsProductionGrup_.data(), globalIsProductionGrup_.size());