From 1796b3343b55e87b684f1b603b76887f5528532d Mon Sep 17 00:00:00 2001 From: Paul Date: Thu, 13 Jul 2023 13:15:54 +0200 Subject: [PATCH] improved messages text --- opm/simulators/utils/PartiallySupportedFlowKeywords.cpp | 8 ++++---- opm/simulators/wells/BlackoilWellModelConstraints.cpp | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/opm/simulators/utils/PartiallySupportedFlowKeywords.cpp b/opm/simulators/utils/PartiallySupportedFlowKeywords.cpp index ec78b9733..32b954f88 100644 --- a/opm/simulators/utils/PartiallySupportedFlowKeywords.cpp +++ b/opm/simulators/utils/PartiallySupportedFlowKeywords.cpp @@ -97,10 +97,10 @@ partiallySupported() "GCONPROD", { {2,{true, allow_values {"NONE", "FLD", "ORAT", "WRAT", "GRAT", "LRAT", "RESV"}, "GCONPROD(TARGET): valid option should be NONE/FLD/ORAT/WRAT/GRAT/LRAT or RESV"}}, // CONTROL_MODE - {7,{true, allow_values {"NONE", "RATE"}, "GCONPROD(ACTION): Only NONE and RATE is supported"}}, - {11,{true, allow_values {"NONE", "RATE"}, "GCONPROD(ACTWAT): Only NONE and RATE is supported"}}, // WATER_EXCEED_PROCEDURE - {12,{true, allow_values {"NONE", "RATE"}, "GCONPROD(ACTGAS): Only NONE and RATE is supported"}}, // GAS_EXCEED_PROCEDURE - {13,{true, allow_values {"NONE", "RATE"}, "GCONPROD(ACTLIQ): Only NONE and RATE is supported"}}, // LIQUID_EXCEED_PROCEDURE + {7,{true, allow_values {"NONE", "RATE"}, "GCONPROD(ACTION): Only NONE and RATE are supported"}}, + {11,{true, allow_values {"NONE", "RATE"}, "GCONPROD(ACTWAT): Only NONE and RATE are supported"}}, // WATER_EXCEED_PROCEDURE + {12,{true, allow_values {"NONE", "RATE"}, "GCONPROD(ACTGAS): Only NONE and RATE are supported"}}, // GAS_EXCEED_PROCEDURE + {13,{true, allow_values {"NONE", "RATE"}, "GCONPROD(ACTLIQ): Only NONE and RATE are supported"}}, // LIQUID_EXCEED_PROCEDURE {21,{true, allow_values {"NONE"}, "GCONPROD(COMBPROC): linearly combined procedure is not used and should be defaulted (1*)"}}, // LIN_TARGET_EXCEED_PROCEDURE }, }, diff --git a/opm/simulators/wells/BlackoilWellModelConstraints.cpp b/opm/simulators/wells/BlackoilWellModelConstraints.cpp index 75e0b22a7..ad2a060f2 100644 --- a/opm/simulators/wells/BlackoilWellModelConstraints.cpp +++ b/opm/simulators/wells/BlackoilWellModelConstraints.cpp @@ -415,7 +415,6 @@ actionOnBrokenConstraints(const Group& group, std::string ss; switch(exceed_action) { case Group::ExceedAction::NONE: { - // phase specific exceed actions need to be considered if (oldControl != newControl && oldControl != Group::ProductionCMode::NONE) { if ((water_exceed_action == Group::ExceedAction::RATE && newControl == Group::ProductionCMode::WRAT) || (gas_exceed_action == Group::ExceedAction::RATE && newControl == Group::ProductionCMode::GRAT) || @@ -427,7 +426,9 @@ actionOnBrokenConstraints(const Group& group, Group::ProductionCMode2String(newControl)); } else { - ss = fmt::format("Group production exceed action is NONE for group {}. Nothing happens.", group.name()); + ss = fmt::format("Procedure on exceeding {} limit is NONE for group {}. Nothing is done.", + Group::ProductionCMode2String(oldControl), + group.name()); } } break;