mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-20 11:48:25 -06:00
Merge pull request #2140 from totto82/fixGroupProd
Fix for hierarchy of production groups.
This commit is contained in:
commit
672835710b
@ -2099,11 +2099,11 @@ namespace Opm
|
|||||||
const auto& well = well_ecl_;
|
const auto& well = well_ecl_;
|
||||||
const auto pu = phaseUsage();
|
const auto pu = phaseUsage();
|
||||||
|
|
||||||
if (!group.isProductionGroup())
|
const Group2::ProductionCMode& currentGroupControl = well_state.currentProductionGroupControl(group.name());
|
||||||
|
if (!group.isProductionGroup() && currentGroupControl != Group2::ProductionCMode::FLD)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
const auto& groupcontrols = group.productionControls(summaryState);
|
const auto& groupcontrols = group.productionControls(summaryState);
|
||||||
const Group2::ProductionCMode& currentGroupControl = well_state.currentProductionGroupControl(group.name());
|
|
||||||
|
|
||||||
switch(currentGroupControl) {
|
switch(currentGroupControl) {
|
||||||
case Group2::ProductionCMode::NONE:
|
case Group2::ProductionCMode::NONE:
|
||||||
|
@ -1077,11 +1077,11 @@ namespace Opm
|
|||||||
const auto& well = well_ecl_;
|
const auto& well = well_ecl_;
|
||||||
const auto pu = phaseUsage();
|
const auto pu = phaseUsage();
|
||||||
|
|
||||||
if (!group.isProductionGroup())
|
const Group2::ProductionCMode& currentGroupControl = well_state.currentProductionGroupControl(group.name());
|
||||||
|
if (!group.isProductionGroup() && currentGroupControl != Group2::ProductionCMode::FLD)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
const auto& groupcontrols = group.productionControls(summaryState);
|
const auto& groupcontrols = group.productionControls(summaryState);
|
||||||
const Group2::ProductionCMode& currentGroupControl = well_state.currentProductionGroupControl(group.name());
|
|
||||||
|
|
||||||
switch(currentGroupControl) {
|
switch(currentGroupControl) {
|
||||||
case Group2::ProductionCMode::NONE:
|
case Group2::ProductionCMode::NONE:
|
||||||
|
Loading…
Reference in New Issue
Block a user