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

Changed ParserKeyword to use vector of records

Browse Source
This commit is contained in:
Joakim Hove
2015-02-20 00:21:32 +01:00
parent 091acd1dd7
commit 875f591a1b
8 changed files with 70 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,7 +35,7 @@ using namespace Opm;
static ParserPtr createWWCTParser() {
ParserKeywordPtr parserKeyword = ParserKeyword::createDynamicSized("WWCT");
{
ParserRecordPtr wwctRecord = parserKeyword->getRecord();
ParserRecordPtr wwctRecord = parserKeyword->getRecord(0);
wwctRecord->addItem(ParserStringItemConstPtr(new ParserStringItem("WELL", ALL)));
}
ParserKeywordPtr summaryKeyword = ParserKeyword::createFixedSized("SUMMARY" , (size_t) 0);
@@ -126,7 +126,7 @@ BOOST_AUTO_TEST_CASE(parser_internal_name_vs_deck_name) {
static ParserPtr createBPRParser() {
ParserKeywordPtr parserKeyword = ParserKeyword::createDynamicSized("BPR");
{
ParserRecordPtr bprRecord = parserKeyword->getRecord();
ParserRecordPtr bprRecord = parserKeyword->getRecord(0);
bprRecord->addItem(ParserIntItemConstPtr(new ParserIntItem("I", SINGLE)));
bprRecord->addItem(ParserIntItemConstPtr(new ParserIntItem("J", SINGLE)));
bprRecord->addItem(ParserIntItemConstPtr(new ParserIntItem("K", SINGLE)));
@@ -239,7 +239,7 @@ BOOST_AUTO_TEST_CASE(parse_truncatedrecords_deckFilledWithDefaults) {
BOOST_CHECK_EQUAL(lastItem_1->getInt(0), 1);
ParserKeywordConstPtr parserKeyword = parser->getParserKeywordFromDeckName("RADFIN4");
ParserRecordConstPtr parserRecord = parserKeyword->getRecord();
ParserRecordConstPtr parserRecord = parserKeyword->getRecord(0);
ParserItemConstPtr nwmaxItem = parserRecord->get("NWMAX");
ParserIntItemConstPtr intItem = std::static_pointer_cast<const ParserIntItem>(nwmaxItem);