fixing the warning messages.

This commit is contained in:
Kai Bao 2016-07-04 12:34:01 +02:00
parent 6a70450422
commit ddec62288a

View File

@ -1283,7 +1283,9 @@ namespace Opm
// the potential limits should not be difficult to add // the potential limits should not be difficult to add
const WellEcon::QuantityLimitEnum& quantity_limit = econ_production_limits.quantityLimit(); const WellEcon::QuantityLimitEnum& quantity_limit = econ_production_limits.quantityLimit();
if (quantity_limit == WellEcon::POTN) { if (quantity_limit == WellEcon::POTN) {
OPM_THROW(std::logic_error, "Only RATE limit is supported for the moment"); const std::string msg = std::string("POTN limit for well ") + well_name + std::string(" is not supported for the moment. \n")
+ std::string("All the limits will be evaluated based on RATE. ");
OpmLog::warning(msg);
} }
const WellMapType& well_map = well_state.wellMap(); const WellMapType& well_map = well_state.wellMap();
@ -1297,13 +1299,13 @@ namespace Opm
if (rate_limit_violated) { if (rate_limit_violated) {
if (econ_production_limits.endRun()) { if (econ_production_limits.endRun()) {
const std::string warning_message = std::string("WARNING: ending run after well closed due to economic limits is not supported yet \n") const std::string warning_message = std::string("ending run after well closed due to economic limits is not supported yet \n")
+ std::string("the program will keep running after ") + well_name + std::string(" is closed"); + std::string("the program will keep running after ") + well_name + std::string(" is closed");
OpmLog::warning(warning_message); OpmLog::warning(warning_message);
} }
if (econ_production_limits.validFollowonWell()) { if (econ_production_limits.validFollowonWell()) {
OpmLog::warning("WARNING: opening following on well after well closed is not supported yet"); OpmLog::warning("opening following on well after well closed is not supported yet");
} }
if (well_ecl->getAutomaticShutIn()) { if (well_ecl->getAutomaticShutIn()) {
@ -1395,7 +1397,7 @@ namespace Opm
} }
if (econ_production_limits.onMinReservoirFluidRate()) { if (econ_production_limits.onMinReservoirFluidRate()) {
OpmLog::warning("WARNING: Minimum reservoir fluid production rate limit is not supported yet"); OpmLog::warning("Minimum reservoir fluid production rate limit is not supported yet");
} }
return false; return false;
@ -1444,15 +1446,15 @@ namespace Opm
} }
if (econ_production_limits.onMaxGasOilRatio()) { if (econ_production_limits.onMaxGasOilRatio()) {
OpmLog::warning("WARNING: the support for max Gas-Oil ratio is not implemented yet!"); OpmLog::warning("the support for max Gas-Oil ratio is not implemented yet!");
} }
if (econ_production_limits.onMaxWaterGasRatio()) { if (econ_production_limits.onMaxWaterGasRatio()) {
OpmLog::warning("WARNING: the support for max Water-Gas ratio is not implemented yet!"); OpmLog::warning("the support for max Water-Gas ratio is not implemented yet!");
} }
if (econ_production_limits.onMaxGasLiquidRatio()) { if (econ_production_limits.onMaxGasLiquidRatio()) {
OpmLog::warning("WARNING: the support for max Gas-Liquid ratio is not implemented yet!"); OpmLog::warning("the support for max Gas-Liquid ratio is not implemented yet!");
} }
if (any_limit_violated) { if (any_limit_violated) {