OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-16 15:51:57 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2075 from joakim-hove/use-location

Browse Source 
Use Location class for keyword location
This commit is contained in:
Joakim Hove 2019-10-19 23:30:51 +02:00 committed by GitHub
commit 5524852a31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
opm/simulators/flow/MissingFeatures.cpp
View File

@ -57,9 +57,10 @@ namespace MissingFeatures {
for (it = itlow; it != itup; ++it) { for (it = itlow; it != itup; ++it) {
const auto& record = keyword.getRecord(0); const auto& record = keyword.getRecord(0);
if (record.getItem(it->second.item).template get<T>(0) != it->second.item_value) { if (record.getItem(it->second.item).template get<T>(0) != it->second.item_value) {
const auto& location = keyword.location();
std::string msg = "For keyword '" + it->first + "' only value " + boost::lexical_cast<std::string>(it->second.item_value) std::string msg = "For keyword '" + it->first + "' only value " + boost::lexical_cast<std::string>(it->second.item_value)
+ " in item " + it->second.item + " is supported by flow.\n" + " in item " + it->second.item + " is supported by flow.\n"
+ "In file " + keyword.getFileName() + ", line " + std::to_string(keyword.getLineNumber()) + "\n"; + "In file " + location.filename + ", line " + std::to_string(location.lineno) + "\n";
parseContext.handleError(ParseContext::SIMULATOR_KEYWORD_ITEM_NOT_SUPPORTED, msg, errorGuard); parseContext.handleError(ParseContext::SIMULATOR_KEYWORD_ITEM_NOT_SUPPORTED, msg, errorGuard);
} }
} }
@ -715,11 +716,12 @@ namespace MissingFeatures {
// check deck and keyword for flow and parser. // check deck and keyword for flow and parser.
for (size_t idx = 0; idx < deck.size(); ++idx) { for (size_t idx = 0; idx < deck.size(); ++idx) {
const auto& keyword = deck.getKeyword(idx); const auto& keyword = deck.getKeyword(idx);
const auto& location = keyword.location();
std::unordered_set<std::string>::const_iterator it; std::unordered_set<std::string>::const_iterator it;
it = unsupported_keywords.find(keyword.name()); it = unsupported_keywords.find(keyword.name());
if (it != unsupported_keywords.end()) { if (it != unsupported_keywords.end()) {
std::string msg = "Keyword '" + keyword.name() + "' is not supported by flow.\n" std::string msg = "Keyword '" + keyword.name() + "' is not supported by flow.\n"
+ "In file " + keyword.getFileName() + ", line " + std::to_string(keyword.getLineNumber()) + "\n"; + "In file " + location.filename + ", line " + std::to_string(location.lineno) + "\n";
parseContext.handleError(ParseContext::SIMULATOR_KEYWORD_NOT_SUPPORTED, msg, errorGuard); parseContext.handleError(ParseContext::SIMULATOR_KEYWORD_NOT_SUPPORTED, msg, errorGuard);
} }
checkOptions<std::string>(keyword, string_options, parseContext, errorGuard); checkOptions<std::string>(keyword, string_options, parseContext, errorGuard);