Merge pull request #4235 from totto82/fixOutputGr

fix group switch logging
This commit is contained in:
Bård Skaflestad 2022-11-03 11:26:51 +01:00 committed by GitHub
commit c541ed45f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions

View File

@ -393,7 +393,7 @@ actionOnBrokenConstraints(const Group& group,
group.name(), group.name(),
Group::InjectionCMode2String(oldControl), Group::InjectionCMode2String(oldControl),
Group::InjectionCMode2String(newControl)); Group::InjectionCMode2String(newControl));
deferred_logger.info(msg); deferred_logger.debug(msg);
} }
} }
} }
@ -472,8 +472,8 @@ updateGroupIndividualControl(const Group& group,
phase); phase);
if (changed_this.first != Group::InjectionCMode::NONE) if (changed_this.first != Group::InjectionCMode::NONE)
{ {
switched_inj.insert({{group.name(), phase}, switched_inj.insert_or_assign({group.name(), phase},
Group::InjectionCMode2String(changed_this.first)}); Group::InjectionCMode2String(changed_this.first));
this->actionOnBrokenConstraints(group, changed_this.first, phase, this->actionOnBrokenConstraints(group, changed_this.first, phase,
group_state, deferred_logger); group_state, deferred_logger);
WellGroupHelpers::updateWellRatesFromGroupTargetScale(changed_this.second, WellGroupHelpers::updateWellRatesFromGroupTargetScale(changed_this.second,
@ -494,8 +494,8 @@ updateGroupIndividualControl(const Group& group,
const auto controls = group.productionControls(wellModel_.summaryState()); const auto controls = group.productionControls(wellModel_.summaryState());
if (changed_this.first != Group::ProductionCMode::NONE) if (changed_this.first != Group::ProductionCMode::NONE)
{ {
switched_prod.insert({group.name(), switched_prod.insert_or_assign(group.name(),
Group::ProductionCMode2String(changed_this.first)}); Group::ProductionCMode2String(changed_this.first));
this->actionOnBrokenConstraints(group, this->actionOnBrokenConstraints(group,
controls.exceed_action, controls.exceed_action,

View File

@ -496,7 +496,7 @@ checkGroupHigherConstraints(const Group& group,
resv_coeff_inj, resv_coeff_inj,
deferred_logger); deferred_logger);
if (is_changed) { if (is_changed) {
switched_inj_groups_.insert({ {group.name(), phase}, Group::InjectionCMode2String(Group::InjectionCMode::FLD)}); switched_inj_groups_.insert_or_assign({group.name(), phase}, Group::InjectionCMode2String(Group::InjectionCMode::FLD));
BlackoilWellModelConstraints(*this). BlackoilWellModelConstraints(*this).
actionOnBrokenConstraints(group, Group::InjectionCMode::FLD, actionOnBrokenConstraints(group, Group::InjectionCMode::FLD,
phase, this->groupState(), phase, this->groupState(),
@ -537,7 +537,7 @@ checkGroupHigherConstraints(const Group& group,
resv_coeff, resv_coeff,
deferred_logger); deferred_logger);
if (is_changed) { if (is_changed) {
switched_prod_groups_.insert({group.name(), Group::ProductionCMode2String(Group::ProductionCMode::FLD)}); switched_prod_groups_.insert_or_assign(group.name(), Group::ProductionCMode2String(Group::ProductionCMode::FLD));
const auto exceed_action = group.productionControls(summaryState_).exceed_action; const auto exceed_action = group.productionControls(summaryState_).exceed_action;
BlackoilWellModelConstraints(*this). BlackoilWellModelConstraints(*this).
actionOnBrokenConstraints(group, exceed_action, actionOnBrokenConstraints(group, exceed_action,