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

Parser: Recognise Keywords 'LAB' and 'PVT-M'

Browse Source 
Add test to verify that the parser recognises these keywords.
This commit is contained in:
Bård Skaflestad
2017-10-06 15:34:49 +02:00
parent c1fad41ae5
commit f9973c5cf0
4 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LAB Normal file
View File

@@ -0,0 +1,3 @@
{"name" : "LAB" ,
"sections" : ["RUNSPEC"]
}

7
src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PVT_M Normal file
View File

@@ -0,0 +1,7 @@
{"name" : "PVT_M" ,
"sections" : ["RUNSPEC"],
"deck_names" : [
"PVT-M"
]
}

2
src/opm/parser/eclipse/share/keywords/keyword_list.cmake
View File

@@ -125,6 +125,7 @@ set( keywords
000_Eclipse100/I/ISWL
000_Eclipse100/I/ISWU
000_Eclipse100/J/JFUNC
000_Eclipse100/L/LAB
000_Eclipse100/L/LGR
000_Eclipse100/L/LIFTOPT
000_Eclipse100/M/MAPAXES
@@ -211,6 +212,7 @@ set( keywords
000_Eclipse100/P/PVDG
000_Eclipse100/P/PVDO
000_Eclipse100/P/PVDS
000_Eclipse100/P/PVT_M
000_Eclipse100/P/PVTG
000_Eclipse100/P/PVTNUM
000_Eclipse100/P/PVTO

20
tests/parser/ParserTests.cpp
View File

@@ -1829,3 +1829,23 @@ BOOST_AUTO_TEST_CASE(TestKeywordActionEnumLoop) {
BOOST_CHECK_EQUAL( "IGNORE_WARNING" , ParserKeywordActionEnum2String(ParserKeywordActionEnumFromString( "IGNORE_WARNING" ) ));
BOOST_CHECK_EQUAL( "THROW_EXCEPTION" , ParserKeywordActionEnum2String(ParserKeywordActionEnumFromString( "THROW_EXCEPTION" ) ));
}
/*****************************************************************/
BOOST_AUTO_TEST_CASE(ParseUnitConventions)
{
const auto* deck_string = R"(
METRIC
FIELD
LAB
PVT-M
)";
Parser parser;
const auto deck = parser.parseString( deck_string, ParseContext() );
BOOST_CHECK( deck.hasKeyword( "METRIC" ) );
BOOST_CHECK( deck.hasKeyword( "FIELD" ) );
BOOST_CHECK( deck.hasKeyword( "LAB" ) );
BOOST_CHECK( deck.hasKeyword( "PVT-M" ) );
}