improved messages text

This commit is contained in:
Paul 2023-07-13 13:15:54 +02:00
parent 7302c37b78
commit 1796b3343b
2 changed files with 7 additions and 6 deletions

View File

@ -97,10 +97,10 @@ partiallySupported()
"GCONPROD",
{
{2,{true, allow_values<std::string> {"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<std::string> {"NONE", "RATE"}, "GCONPROD(ACTION): Only NONE and RATE is supported"}},
{11,{true, allow_values<std::string> {"NONE", "RATE"}, "GCONPROD(ACTWAT): Only NONE and RATE is supported"}}, // WATER_EXCEED_PROCEDURE
{12,{true, allow_values<std::string> {"NONE", "RATE"}, "GCONPROD(ACTGAS): Only NONE and RATE is supported"}}, // GAS_EXCEED_PROCEDURE
{13,{true, allow_values<std::string> {"NONE", "RATE"}, "GCONPROD(ACTLIQ): Only NONE and RATE is supported"}}, // LIQUID_EXCEED_PROCEDURE
{7,{true, allow_values<std::string> {"NONE", "RATE"}, "GCONPROD(ACTION): Only NONE and RATE are supported"}},
{11,{true, allow_values<std::string> {"NONE", "RATE"}, "GCONPROD(ACTWAT): Only NONE and RATE are supported"}}, // WATER_EXCEED_PROCEDURE
{12,{true, allow_values<std::string> {"NONE", "RATE"}, "GCONPROD(ACTGAS): Only NONE and RATE are supported"}}, // GAS_EXCEED_PROCEDURE
{13,{true, allow_values<std::string> {"NONE", "RATE"}, "GCONPROD(ACTLIQ): Only NONE and RATE are supported"}}, // LIQUID_EXCEED_PROCEDURE
{21,{true, allow_values<std::string> {"NONE"}, "GCONPROD(COMBPROC): linearly combined procedure is not used and should be defaulted (1*)"}}, // LIN_TARGET_EXCEED_PROCEDURE
},
},

View File

@ -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;