OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplified initialization

Browse Source
This commit is contained in:
Joakim Hove 2020-11-04 12:20:40 +01:00
parent c392c5aaa2
commit 7c1b2ff6b4
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/opm/output/eclipse/AggregateGroupData.cpp
View File

@ -453,16 +453,13 @@ void productionGroup(const Opm::Schedule& sched,
const auto& production_controls = group.productionControls(sumState); const auto& production_controls = group.productionControls(sumState);
const auto& prod_guide_rate_def = production_controls.guide_rate_def; const auto& prod_guide_rate_def = production_controls.guide_rate_def;
const auto& p_exceed_act = production_controls.exceed_action;
// Find production control mode for group
const double cur_prod_ctrl = sumState.get_group_var(group.name(), "GMCTP", -1);
Opm::Group::ProductionCMode active_cmode = Opm::Group::ProductionCMode::NONE; Opm::Group::ProductionCMode active_cmode = Opm::Group::ProductionCMode::NONE;
if (cur_prod_ctrl >= 0) { {
const auto it_ctrl = pCtrlToPCmode.find(cur_prod_ctrl); auto cur_prod_ctrl = sumState.get_group_var(group.name(), "GMCTP", -1);
if (it_ctrl != pCtrlToPCmode.end()) { if (cur_prod_ctrl >= 0)
active_cmode = it_ctrl->second; active_cmode = pCtrlToPCmode.at(static_cast<int>(cur_prod_ctrl));
}
} }
#if ENABLE_GCNTL_DEBUG_OUTPUT #if ENABLE_GCNTL_DEBUG_OUTPUT
else { else {
// std::stringstream str; // std::stringstream str;
@ -586,6 +583,7 @@ void productionGroup(const Opm::Schedule& sched,
iGrp[nwgmax + IGroup::GuideRateDef] = Value::GuideRateMode::None; iGrp[nwgmax + IGroup::GuideRateDef] = Value::GuideRateMode::None;
const auto& p_exceed_act = production_controls.exceed_action;
switch (deck_cmode) { switch (deck_cmode) {
case Opm::Group::ProductionCMode::NONE: case Opm::Group::ProductionCMode::NONE:
iGrp[nwgmax + 7] = (p_exceed_act == Opm::Group::ExceedAction::NONE) ? 0 : 4; iGrp[nwgmax + 7] = (p_exceed_act == Opm::Group::ExceedAction::NONE) ? 0 : 4;