OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3504 from joakim-hove/use-group-controls

Browse Source 
Use the group object to query for controls
This commit is contained in:
Tor Harald Sandve 2021-09-03 07:32:43 +02:00 committed by GitHub
commit 87b618e93a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
opm/simulators/wells/BlackoilWellModelGeneric.cpp
View File

@ -438,10 +438,8 @@ checkGroupInjectionConstraints(const Group& group,
else
OPM_THROW(std::runtime_error, "Unknown phase" );
const auto& controls = group.injectionControls(phase, summaryState_);
auto currentControl = this->groupState().injection_control(group.name(), phase);
if (controls.has_control(Group::InjectionCMode::RATE))
if (group.has_control(phase, Group::InjectionCMode::RATE))
{
if (currentControl != Group::InjectionCMode::RATE)
{
@ -451,6 +449,7 @@ checkGroupInjectionConstraints(const Group& group,
// sum over all nodes
current_rate = comm_.sum(current_rate);
const auto& controls = group.injectionControls(phase, this->summaryState_);
if (controls.surface_max_rate < current_rate) {
double scale = 1.0;
if (current_rate > 1e-12)
@ -459,7 +458,7 @@ checkGroupInjectionConstraints(const Group& group,
}
}
}
if (controls.has_control(Group::InjectionCMode::RESV))
if (group.has_control(phase, Group::InjectionCMode::RESV))
{
if (currentControl != Group::InjectionCMode::RESV)
{
@ -468,6 +467,7 @@ checkGroupInjectionConstraints(const Group& group,
// sum over all nodes
current_rate = comm_.sum(current_rate);
const auto& controls = group.injectionControls(phase, this->summaryState_);
if (controls.resv_max_rate < current_rate) {
double scale = 1.0;
if (current_rate > 1e-12)
@ -476,11 +476,12 @@ checkGroupInjectionConstraints(const Group& group,
}
}
}
if (controls.has_control(Group::InjectionCMode::REIN))
if (group.has_control(phase, Group::InjectionCMode::REIN))
{
if (currentControl != Group::InjectionCMode::REIN)
{
double production_Rate = 0.0;
const auto& controls = group.injectionControls(phase, this->summaryState_);
const Group& groupRein = schedule().getGroup(controls.reinj_group, reportStepIdx);
production_Rate += WellGroupHelpers::sumWellSurfaceRates(groupRein, schedule(), well_state, reportStepIdx, phasePos, /*isInjector*/false);
@ -501,11 +502,12 @@ checkGroupInjectionConstraints(const Group& group,
}
}
}
if (controls.has_control(Group::InjectionCMode::VREP))
if (group.has_control(phase, Group::InjectionCMode::VREP))
{
if (currentControl != Group::InjectionCMode::VREP)
{
double voidage_rate = 0.0;
const auto& controls = group.injectionControls(phase, this->summaryState_);
const Group& groupVoidage = schedule().getGroup(controls.voidage_group, reportStepIdx);
voidage_rate += WellGroupHelpers::sumWellResRates(groupVoidage, schedule(), well_state, reportStepIdx, phase_usage_.phase_pos[BlackoilPhases::Aqua], false);
voidage_rate += WellGroupHelpers::sumWellResRates(groupVoidage, schedule(), well_state, reportStepIdx, phase_usage_.phase_pos[BlackoilPhases::Liquid], false);