OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add region number for unscaled endpoints.

Browse Source
This commit is contained in:
Liu Ming 2016-01-06 09:44:56 +08:00
parent 708da37250
commit 30ace9cdcc
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
opm/core/props/satfunc/RelpermDiagnostics.cpp
View File

@ -582,13 +582,13 @@ namespace Opm{
//unscaledEpsInfo_[satnumIdx].print(); //unscaledEpsInfo_[satnumIdx].print();
///Consistency check. ///Consistency check.
if (unscaledEpsInfo_[satnumIdx].Sgu > (1. - unscaledEpsInfo_[satnumIdx].Swl)) { if (unscaledEpsInfo_[satnumIdx].Sgu > (1. - unscaledEpsInfo_[satnumIdx].Swl)) {
std::string msg = "Error: Sgmax should not exceed 1-Swco."; std::string msg = "Error: In region" + std::to_string(satnumIdx) + "Sgmax should not exceed 1-Swco.";
messages_.push_back(msg); messages_.push_back(msg);
streamLog_->addMessage(Log::MessageType::Warning, msg); streamLog_->addMessage(Log::MessageType::Warning, msg);
counter_.error += 1; counter_.error += 1;
} }
if (unscaledEpsInfo_[satnumIdx].Sgl > (1. - unscaledEpsInfo_[satnumIdx].Swu)) { if (unscaledEpsInfo_[satnumIdx].Sgl > (1. - unscaledEpsInfo_[satnumIdx].Swu)) {
std::string msg = "Error: Sgco should not exceed 1-Swmax."; std::string msg = "Error: In region" + std::to_string(satnumIdx) + "Sgco should not exceed 1-Swmax.";
messages_.push_back(msg); messages_.push_back(msg);
streamLog_->addMessage(Log::MessageType::Warning, msg); streamLog_->addMessage(Log::MessageType::Warning, msg);
counter_.error += 1; counter_.error += 1;
@ -622,7 +622,7 @@ namespace Opm{
krog_value = table.evaluate("KROG" , Sou); krog_value = table.evaluate("KROG" , Sou);
} }
if (krow_value != krog_value) { if (krow_value != krog_value) {
std::string msg = "Error: Krow(sSomax) should equal Krog(Somax)."; std::string msg = "Error: In region" + std::to_string(satnumIdx) + "Krow(sSomax) should equal Krog(Somax).";
messages_.push_back(msg); messages_.push_back(msg);
streamLog_->addMessage(Log::MessageType::Warning, msg); streamLog_->addMessage(Log::MessageType::Warning, msg);
counter_.error += 1; counter_.error += 1;
@ -631,13 +631,13 @@ namespace Opm{
///Krw(Sw=0)=Krg(Sg=0)=Krow(So=0)=Krog(So=0)=0. ///Krw(Sw=0)=Krg(Sg=0)=Krow(So=0)=Krog(So=0)=0.
///Mobile fluid requirements ///Mobile fluid requirements
if (((unscaledEpsInfo_[satnumIdx].Sowcr + unscaledEpsInfo_[satnumIdx].Swcr)-1) >= 0) { if (((unscaledEpsInfo_[satnumIdx].Sowcr + unscaledEpsInfo_[satnumIdx].Swcr)-1) >= 0) {
std::string msg = "Error: Sowcr + Swcr should less than 1."; std::string msg = "Error: In region" + std::to_string(satnumIdx) + "Sowcr + Swcr should less than 1.";
messages_.push_back(msg); messages_.push_back(msg);
streamLog_->addMessage(Log::MessageType::Warning, msg); streamLog_->addMessage(Log::MessageType::Warning, msg);
counter_.error += 1; counter_.error += 1;
} }
if (((unscaledEpsInfo_[satnumIdx].Sogcr + unscaledEpsInfo_[satnumIdx].Sgcr + unscaledEpsInfo_[satnumIdx].Swl) - 1 ) > 0) { if (((unscaledEpsInfo_[satnumIdx].Sogcr + unscaledEpsInfo_[satnumIdx].Sgcr + unscaledEpsInfo_[satnumIdx].Swl) - 1 ) > 0) {
std::string msg = "Error: Sogcr + Sgcr + Swco should less than 1."; std::string msg = "Error: In rgion" + std::to_string(satnumIdx) + "Sogcr + Sgcr + Swco should less than 1.";
messages_.push_back(msg); messages_.push_back(msg);
streamLog_->addMessage(Log::MessageType::Warning, msg); streamLog_->addMessage(Log::MessageType::Warning, msg);
counter_.error += 1; counter_.error += 1;