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

Removed explicit keyword loading

Browse Source
This commit is contained in:
Joakim Hove 2013-10-08 14:19:05 +02:00
parent cc21644c9e
commit b99d5d75cc
3 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
opm/parser/eclipse/IntegrationTests/IncludeTest.cpp
View File

@ -106,7 +106,6 @@ createDeckWithInclude(path& datafile)
BOOST_AUTO_TEST_CASE(parse_fileWithWWCTKeyword_deckReturned) {
path datafile;
ParserPtr parser(new Parser());
parser->loadKeywordsFromDirectory(KEYWORD_DIRECTORY);
createDeckWithInclude (datafile);
DeckConstPtr deck = parser->parse(datafile.string());

1
opm/parser/eclipse/IntegrationTests/IntegrationTests.cpp
View File

@ -172,7 +172,6 @@ BOOST_AUTO_TEST_CASE(parse_unknownkeywordWithstrictparsing_exceptionthrown) {
// Datafile contains 3 RADFIN4 keywords. One fully specified, one with 2 out of 11 items, and one with no items.
BOOST_AUTO_TEST_CASE(parse_truncatedrecords_deckFilledWithDefaults) {
ParserPtr parser(new Parser());
parser->loadKeywordsFromDirectory(KEYWORD_DIRECTORY);
DeckPtr deck = parser->parse("testdata/integration_tests/truncated_records.data");
BOOST_CHECK_EQUAL(4U, deck->size());
DeckKeywordConstPtr radfin4_0_full= deck->getKeyword("RADFIN4", 0);

2
opm/parser/eclipse/IntegrationTests/ParseWCONHIST.cpp
View File

@ -37,7 +37,7 @@ using namespace Opm;
BOOST_AUTO_TEST_CASE( parse_WCHONHIST_OK ) {
ParserPtr parser(new Parser());
parser->loadKeywordsFromDirectory(KEYWORD_DIRECTORY);
//parser->loadKeywordsFromDirectory(KEYWORD_DIRECTORY);
boost::filesystem::path wconhistFile("testdata/integration_tests/WCONHIST/WCONHIST1");
DeckPtr deck = parser->parse(wconhistFile.string());
DeckKeywordConstPtr kw1 = deck->getKeyword("WCONHIST" , 0);