From 2886fe2fe98186ba7e0fbb2fe83a1338ceec1170 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Wed, 17 Apr 2024 10:34:39 +0200 Subject: [PATCH 1/3] BlackoilWellModelConstraints: break some long lines --- .../wells/BlackoilWellModelConstraints.cpp | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/opm/simulators/wells/BlackoilWellModelConstraints.cpp b/opm/simulators/wells/BlackoilWellModelConstraints.cpp index e3c174dc7..4bf712829 100644 --- a/opm/simulators/wells/BlackoilWellModelConstraints.cpp +++ b/opm/simulators/wells/BlackoilWellModelConstraints.cpp @@ -412,15 +412,19 @@ actionOnBrokenConstraints(const Group& group, { bool changed = false; - const Group::ProductionCMode oldControl = wellModel_.groupState().production_control(group.name()); + const Group::ProductionCMode oldControl = + wellModel_.groupState().production_control(group.name()); std::string ss; switch(group_limit_action.allRates) { case Group::ExceedAction::NONE: { if (oldControl != newControl && oldControl != Group::ProductionCMode::NONE) { - if ((group_limit_action.water == Group::ExceedAction::RATE && newControl == Group::ProductionCMode::WRAT) || - (group_limit_action.gas == Group::ExceedAction::RATE && newControl == Group::ProductionCMode::GRAT) || - (group_limit_action.liquid == Group::ExceedAction::RATE && newControl == Group::ProductionCMode::LRAT)) { + if ((group_limit_action.water == Group::ExceedAction::RATE && + newControl == Group::ProductionCMode::WRAT) || + (group_limit_action.gas == Group::ExceedAction::RATE && + newControl == Group::ProductionCMode::GRAT) || + (group_limit_action.liquid == Group::ExceedAction::RATE && + newControl == Group::ProductionCMode::LRAT)) { group_state.production_control(group.name(), newControl); ss = fmt::format("Switching production control mode for group {} from {} to {}", group.name(), @@ -430,7 +434,8 @@ actionOnBrokenConstraints(const Group& group, changed = true; } else { - ss = fmt::format("Procedure on exceeding {} limit is NONE for group {}. Nothing is done.", + ss = fmt::format("Procedure on exceeding {} limit is NONE for group {}. " + "Nothing is done.", Group::ProductionCMode2String(oldControl), group.name()); } @@ -447,8 +452,10 @@ actionOnBrokenConstraints(const Group& group, } case Group::ExceedAction::WELL: { - std::tie(worst_offending_well, std::ignore) = WellGroupHelpers::worstOffendingWell(group, wellModel_.schedule(), reportStepIdx, - newControl, wellModel_.phaseUsage(), wellModel_.comm(), well_state, deferred_logger); + std::tie(worst_offending_well, std::ignore) = + WellGroupHelpers::worstOffendingWell(group, wellModel_.schedule(), reportStepIdx, + newControl, wellModel_.phaseUsage(), + wellModel_.comm(), well_state, deferred_logger); break; } case Group::ExceedAction::PLUG: { From 99f45ae916737456454704d8f318f61a8535e88c Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Wed, 17 Apr 2024 10:35:57 +0200 Subject: [PATCH 2/3] BlackoilWellModelConstraints: use fmt --- .../wells/BlackoilWellModelConstraints.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/opm/simulators/wells/BlackoilWellModelConstraints.cpp b/opm/simulators/wells/BlackoilWellModelConstraints.cpp index 4bf712829..e04c10b07 100644 --- a/opm/simulators/wells/BlackoilWellModelConstraints.cpp +++ b/opm/simulators/wells/BlackoilWellModelConstraints.cpp @@ -443,11 +443,17 @@ actionOnBrokenConstraints(const Group& group, break; } case Group::ExceedAction::CON: { - OPM_DEFLOG_THROW(std::runtime_error, "Group " + group.name() + "GroupProductionExceedLimit CON not implemented", deferred_logger); + OPM_DEFLOG_THROW(std::runtime_error, + fmt::format("Group {} GroupProductionExceedLimit CON not implemented", + group.name()), + deferred_logger); break; } case Group::ExceedAction::CON_PLUS: { - OPM_DEFLOG_THROW(std::runtime_error, "Group " + group.name() + "GroupProductionExceedLimit CON_PLUS not implemented", deferred_logger); + OPM_DEFLOG_THROW(std::runtime_error, + fmt::format("Group {} GroupProductionExceedLimit CON_PLUS not implemented", + group.name()), + deferred_logger); break; } case Group::ExceedAction::WELL: { @@ -459,7 +465,10 @@ actionOnBrokenConstraints(const Group& group, break; } case Group::ExceedAction::PLUG: { - OPM_DEFLOG_THROW(std::runtime_error, "Group " + group.name() + "GroupProductionExceedLimit PLUG not implemented", deferred_logger); + OPM_DEFLOG_THROW(std::runtime_error, + fmt::format("Group {} GroupProductionExceedLimit PLUG not implemented", + group.name()), + deferred_logger); break; } case Group::ExceedAction::RATE: { From a3f554e4fb32626c05713852fe594f9fa4a96623 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Wed, 17 Apr 2024 10:36:13 +0200 Subject: [PATCH 3/3] fixed: don't throw a bare string and use OPM_THROW --- opm/simulators/wells/BlackoilWellModelConstraints.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/opm/simulators/wells/BlackoilWellModelConstraints.cpp b/opm/simulators/wells/BlackoilWellModelConstraints.cpp index e04c10b07..ce34e2f04 100644 --- a/opm/simulators/wells/BlackoilWellModelConstraints.cpp +++ b/opm/simulators/wells/BlackoilWellModelConstraints.cpp @@ -483,7 +483,8 @@ actionOnBrokenConstraints(const Group& group, break; } default: - throw("Invalid procedure for maximum rate limit selected for group" + group.name()); + OPM_THROW(std::runtime_error, + "Invalid procedure for maximum rate limit selected for group" + group.name()); } if (!ss.empty() && wellModel_.comm().rank() == 0)