OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

argument of warning() method is msg, filename, linenumber.

Browse Source
This commit is contained in:
Liu Ming
2016-08-29 14:01:14 +08:00
parent d6287e4db5
commit 756b4d1edd
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
opm/parser/eclipse/Parser/Parser.cpp
View File

@@ -837,7 +837,7 @@ std::vector<std::string> Parser::getAllDeckNames () const {
if( deck.getKeyword(0).name() != "RUNSPEC" ) {
std::string msg = "The first keyword of a valid deck must be RUNSPEC\n";
auto curKeyword = deck.getKeyword(0);
deck.getMessageContainer().warning(curKeyword.getFileName(), msg, curKeyword.getLineNumber());
deck.getMessageContainer().warning(msg, curKeyword.getFileName(), curKeyword.getLineNumber());
deckValid = false;
}
@@ -857,7 +857,7 @@ std::vector<std::string> Parser::getAllDeckNames () const {
std::string msg =
"The keyword '"+curKeywordName+"' is located in the '"+curSectionName
+"' section where it is invalid";
deck.getMessageContainer().warning(curKeyword.getFileName(), msg, curKeyword.getLineNumber());
deck.getMessageContainer().warning(msg, curKeyword.getFileName(), curKeyword.getLineNumber());
deckValid = false;
}
@@ -868,7 +868,7 @@ std::vector<std::string> Parser::getAllDeckNames () const {
if (curKeywordName != "GRID") {
std::string msg =
"The RUNSPEC section must be followed by GRID instead of "+curKeywordName;
deck.getMessageContainer().warning(curKeyword.getFileName(), msg, curKeyword.getLineNumber());
deck.getMessageContainer().warning(msg, curKeyword.getFileName(), curKeyword.getLineNumber());
deckValid = false;
}
@@ -878,7 +878,7 @@ std::vector<std::string> Parser::getAllDeckNames () const {
if (curKeywordName != "EDIT" && curKeywordName != "PROPS") {
std::string msg =
"The GRID section must be followed by EDIT or PROPS instead of "+curKeywordName;
deck.getMessageContainer().warning(curKeyword.getFileName(), msg, curKeyword.getLineNumber());
deck.getMessageContainer().warning(msg, curKeyword.getFileName(), curKeyword.getLineNumber());
deckValid = false;
}
@@ -888,7 +888,7 @@ std::vector<std::string> Parser::getAllDeckNames () const {
if (curKeywordName != "PROPS") {
std::string msg =
"The EDIT section must be followed by PROPS instead of "+curKeywordName;
deck.getMessageContainer().warning(curKeyword.getFileName(), msg, curKeyword.getLineNumber());
deck.getMessageContainer().warning(msg, curKeyword.getFileName(), curKeyword.getLineNumber());
deckValid = false;
}
@@ -898,7 +898,7 @@ std::vector<std::string> Parser::getAllDeckNames () const {
if (curKeywordName != "REGIONS" && curKeywordName != "SOLUTION") {
std::string msg =
"The PROPS section must be followed by REGIONS or SOLUTION instead of "+curKeywordName;
deck.getMessageContainer().warning(curKeyword.getFileName(), msg, curKeyword.getLineNumber());
deck.getMessageContainer().warning(msg, curKeyword.getFileName(), curKeyword.getLineNumber());
deckValid = false;
}
@@ -908,7 +908,7 @@ std::vector<std::string> Parser::getAllDeckNames () const {
if (curKeywordName != "SOLUTION") {
std::string msg =
"The REGIONS section must be followed by SOLUTION instead of "+curKeywordName;
deck.getMessageContainer().warning(curKeyword.getFileName(), msg, curKeyword.getLineNumber());
deck.getMessageContainer().warning(msg, curKeyword.getFileName(), curKeyword.getLineNumber());
deckValid = false;
}
@@ -918,7 +918,7 @@ std::vector<std::string> Parser::getAllDeckNames () const {
if (curKeywordName != "SUMMARY" && curKeywordName != "SCHEDULE") {
std::string msg =
"The SOLUTION section must be followed by SUMMARY or SCHEDULE instead of "+curKeywordName;
deck.getMessageContainer().warning(curKeyword.getFileName(), msg, curKeyword.getLineNumber());
deck.getMessageContainer().warning(msg, curKeyword.getFileName(), curKeyword.getLineNumber());
deckValid = false;
}
@@ -928,7 +928,7 @@ std::vector<std::string> Parser::getAllDeckNames () const {
if (curKeywordName != "SCHEDULE") {
std::string msg =
"The SUMMARY section must be followed by SCHEDULE instead of "+curKeywordName;
deck.getMessageContainer().warning(curKeyword.getFileName(), msg, curKeyword.getLineNumber());
deck.getMessageContainer().warning(msg, curKeyword.getFileName(), curKeyword.getLineNumber());
deckValid = false;
}
@@ -939,7 +939,7 @@ std::vector<std::string> Parser::getAllDeckNames () const {
std::string msg =
"The SCHEDULE section must be the last one ("
+curKeywordName+" specified after SCHEDULE)";
deck.getMessageContainer().warning(curKeyword.getFileName(), msg, curKeyword.getLineNumber());
deck.getMessageContainer().warning(msg, curKeyword.getFileName(), curKeyword.getLineNumber());
deckValid = false;
}
}
@@ -949,7 +949,7 @@ std::vector<std::string> Parser::getAllDeckNames () const {
const auto& curKeyword = deck.getKeyword(deck.size() - 1);
std::string msg =
"The last section of a valid deck must be SCHEDULE (is "+curSectionName+")";
deck.getMessageContainer().warning(curKeyword.getFileName(), msg, curKeyword.getLineNumber());
deck.getMessageContainer().warning(msg, curKeyword.getFileName(), curKeyword.getLineNumber());
deckValid = false;
}