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

Merge remote-tracking branch 'upstream/master' into time-map

Browse Source
This commit is contained in:
Joakim Hove
2013-10-24 15:25:43 +02:00
parent f303c09690 53ef54225a
commit 1efadb4af2
4 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -228,12 +228,12 @@ BOOST_AUTO_TEST_CASE(ReplaceKeyword) {
ParserPtr parser(new Parser());
ParserKeywordConstPtr eqldims = parser->getKeyword("EQLDIMS");
BOOST_CHECK_EQUAL( 5 , eqldims->numItems());
BOOST_CHECK_EQUAL( 5u , eqldims->numItems());
parser->loadKeywordFromFile( "testdata/parser/EQLDIMS2" );
eqldims = parser->getKeyword("EQLDIMS");
BOOST_CHECK_EQUAL( 1 , eqldims->numItems());
BOOST_CHECK_EQUAL( 1u , eqldims->numItems());
}

1
opm/parser/eclipse/RawDeck/StarToken.hpp
View File

@@ -22,6 +22,7 @@
#include <string>
#include <iostream>
#include <cstdlib> // strtol, strtod
#define STAR '*'
#define C_EOS '\0'