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

Minor minor

Browse Source
This commit is contained in:
Joakim Hove 2013-10-08 17:03:46 +02:00
parent 6dce82c5a5
commit 253d8bec0f
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
opm/parser/eclipse/Applications/EclipseDataDoctor.cpp
View File

@ -13,17 +13,26 @@
void printDeckDiagnostics(Opm::DeckConstPtr deck, bool printAllKeywords) {
int recognizedKeywords = 0;
int unrecognizedKeywords = 0;
for (size_t i = 0; i < deck->size(); i++) {
if (!deck->getKeyword(i)->isKnown()) {
if (!deck->getKeyword(i)->isKnown())
unrecognizedKeywords++;
std::cout << "Warning, this looks like a keyword, but is not in the configuration: " << deck->getKeyword(i)->name() << std::endl;
} else
else
recognizedKeywords++;
if (printAllKeywords) {
std::cout << "Keyword (" << i << "): " << deck->getKeyword(i)->name() << " " << std::endl;
}
}
{
for (size_t iw = 0; iw < deck->numWarnings(); iw++) {
const std::pair<std::string,std::pair<std::string,size_t> >& warning = deck->getWarning( iw );
const std::pair<std::string,size_t>& location = warning.second;
std::cout << warning.first << " at " << location.first << ":" << location.second << std::endl;
}
}
std::cout << "Total number of warnings: " << deck->numWarnings() << std::endl;
std::cout << "Number of recognized keywords: " << recognizedKeywords << std::endl;
std::cout << "Number of unrecognized keywords: " << unrecognizedKeywords << std::endl;
std::cout << "Total number of keywords: " << deck->size() << std::endl;

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

@ -115,11 +115,11 @@ namespace Opm {
DeckKeywordConstPtr deckKeyword = parserKeyword->parse(rawKeyword);
deck->addKeyword(deckKeyword);
} else if (action == IGNORE_WARNING)
deck->addWarning( "The keyword " + rawKeyword->getKeywordName() + " is ignored - this might potentially affect the results." , file.string() , rawKeyword->getLineNR());
deck->addWarning( "The keyword " + rawKeyword->getKeywordName() + " is ignored - this might potentially affect the results" , file.string() , rawKeyword->getLineNR());
} else {
DeckKeywordConstPtr deckKeyword(new DeckKeyword(rawKeyword->getKeywordName(), false));
deck->addKeyword(deckKeyword);
deck->addWarning( "The keyword " + rawKeyword->getKeywordName() + " is not recognized." , file.string() , lineNR);
deck->addWarning( "The keyword " + rawKeyword->getKeywordName() + " is not recognized" , file.string() , lineNR);
}
}
rawKeyword.reset();