Merge pull request #2140 from totto82/fixGroupProd

Fix for hierarchy of production groups.
This commit is contained in:
Atgeirr Flø Rasmussen 2019-11-05 16:15:29 +01:00 committed by GitHub
commit 672835710b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View File

@ -2099,11 +2099,11 @@ namespace Opm
const auto& well = well_ecl_;
const auto pu = phaseUsage();
if (!group.isProductionGroup())
const Group2::ProductionCMode& currentGroupControl = well_state.currentProductionGroupControl(group.name());
if (!group.isProductionGroup() && currentGroupControl != Group2::ProductionCMode::FLD)
return;
const auto& groupcontrols = group.productionControls(summaryState);
const Group2::ProductionCMode& currentGroupControl = well_state.currentProductionGroupControl(group.name());
switch(currentGroupControl) {
case Group2::ProductionCMode::NONE:

View File

@ -1077,11 +1077,11 @@ namespace Opm
const auto& well = well_ecl_;
const auto pu = phaseUsage();
if (!group.isProductionGroup())
const Group2::ProductionCMode& currentGroupControl = well_state.currentProductionGroupControl(group.name());
if (!group.isProductionGroup() && currentGroupControl != Group2::ProductionCMode::FLD)
return;
const auto& groupcontrols = group.productionControls(summaryState);
const Group2::ProductionCMode& currentGroupControl = well_state.currentProductionGroupControl(group.name());
switch(currentGroupControl) {
case Group2::ProductionCMode::NONE: