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

Merged with upstream/master

Browse Source
This commit is contained in:
Joakim Hove
2013-08-29 12:13:47 +02:00
parent 71dd19d11c e55d52654d
commit 0580cebb33
2 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
opm/parser/eclipse/Parser/Parser.cpp
+15 -20
View File
@@ -45,26 +45,25 @@ namespace Opm {
return deck;
}
size_t Parser::size() const {
return m_parserKeywords.size();
}
void Parser::addKeyword(ParserKeywordConstPtr parserKeyword) {
m_parserKeywords.insert(std::make_pair(parserKeyword->getName(), parserKeyword));
}
bool Parser::hasKeyword(const std::string& keyword) const {
return m_parserKeywords.find(keyword) != m_parserKeywords.end();
}
ParserKeywordConstPtr Parser::getKeyword(const std::string& keyword) const {
if (hasKeyword(keyword)) {
return m_parserKeywords.at(keyword);
}
}
ParserKeywordConstPtr Parser::getKeyword(const std::string& keyword) const {
if (hasKeyword(keyword)) {
return m_parserKeywords.at(keyword);
}
else
throw std::invalid_argument("Keyword: " + keyword + " does not exist");
}
void Parser::parseFile(DeckPtr deck, const std::string &file, bool parseStrict) const {
std::ifstream inputstream;
@@ -121,8 +120,6 @@ namespace Opm {
throw std::invalid_argument("Input JSON object is not an array");
}
RawKeywordPtr Parser::createRawKeyword(const DeckConstPtr deck, const std::string& keywordString, bool strictParsing) const {
if (hasKeyword(keywordString)) {
ParserKeywordConstPtr parserKeyword = m_parserKeywords.find(keywordString)->second;
@@ -191,8 +188,8 @@ namespace Opm {
try {
Json::JsonObject jsonKeyword(configFile);
ParserKeywordConstPtr parserKeyword( new ParserKeyword( jsonKeyword ));
addKeyword( parserKeyword );
ParserKeywordConstPtr parserKeyword(new ParserKeyword(jsonKeyword));
addKeyword(parserKeyword);
return true;
} catch (...) {
return false;
@@ -200,18 +197,17 @@ namespace Opm {
}
void Parser::loadKeywordsFromDirectory(const boost::filesystem::path& directory, bool recursive, bool onlyALLCAPS8) {
if (!boost::filesystem::exists(directory))
throw std::invalid_argument("Directory: " + directory.string() + " does not exist.");
else {
boost::filesystem::directory_iterator end;
for (boost::filesystem::directory_iterator iter(directory) ; iter != end; iter++) {
if (is_directory(*iter)) {
for (boost::filesystem::directory_iterator iter(directory); iter != end; iter++) {
if (boost::filesystem::is_directory(*iter)) {
if (recursive)
loadKeywordsFromDirectory(*iter , recursive , onlyALLCAPS8);
loadKeywordsFromDirectory(*iter, recursive, onlyALLCAPS8);
} else {
if (ParserKeyword::validName( iter->path().filename()) || !onlyALLCAPS8 ) {
if (ParserKeyword::validName(iter->path().filename().string()) || !onlyALLCAPS8) {
if (!loadKeywordFromFile(*iter))
std::cerr << "** Warning: failed to load keyword from file:" << iter->path() << std::endl;
}
@@ -219,7 +215,6 @@ namespace Opm {
}
}
}
void Parser::populateDefaultKeywords() {
addKeyword(ParserKeywordConstPtr(new ParserKeyword("GRIDUNIT", 1)));
opm/parser/eclipse/Parser/tests/ParserTests.cpp
+8 -1
View File
@@ -59,13 +59,20 @@ BOOST_AUTO_TEST_CASE(hasKeyword_hasKeyword_returnstrue) {
}
BOOST_AUTO_TEST_CASE(Keyword_getKeyword_returnskeyword) {
BOOST_AUTO_TEST_CASE(getKeyword_haskeyword_returnskeyword) {
ParserPtr parser(new Parser());
ParserKeywordConstPtr parserKeyword(new ParserKeyword("FJAS"));
parser->addKeyword(parserKeyword);
BOOST_CHECK_EQUAL(parserKeyword, parser->getKeyword("FJAS"));
}
BOOST_AUTO_TEST_CASE(getKeyword_hasnotkeyword_throws) {
ParserPtr parser(new Parser());
ParserKeywordConstPtr parserKeyword(new ParserKeyword("FJAS"));
parser->addKeyword(parserKeyword);
BOOST_CHECK_THROW(parser->getKeyword("FJASS"), std::invalid_argument);
}
/************************ JSON config related tests **********************'*/