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

allow keywords to match regular expressions as their deck name

Browse Source 
the RE used is specified via the "deck_name_regex" in the JSON file of
the respective keyword. A deck name is assumed to match a given parser
internal keyword if the deck name is valid and if it is either in the
list specified by the "deck_names" entry or if it matches the regular
expression.

This functionality is useful to implement the well probes for the
tracers as well as replacing the current "wild card keyword"
implementation which only allows a star as a suffix.
This commit is contained in:
Andreas Lauser
2014-06-25 16:32:02 +02:00
parent ed4a1d3e09
commit 96904b00f4
4 changed files with 74 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
opm/parser/eclipse/Parser/tests/ParserKeywordTests.cpp
View File

@@ -63,15 +63,6 @@ BOOST_AUTO_TEST_CASE(ParserKeyword_withOtherSize_SizeTypeOTHER) {
BOOST_CHECK_EQUAL("NTEQUIL" , sizeKW.second );
}
BOOST_AUTO_TEST_CASE(ParserKeyword_wildCardName) {
BOOST_CHECK_EQUAL( true , ParserKeyword::wildCardName("SUM*"));
BOOST_CHECK_EQUAL( false , ParserKeyword::wildCardName("SUM*X"));
BOOST_CHECK_EQUAL( false , ParserKeyword::wildCardName("sUM*"));
BOOST_CHECK_EQUAL( false , ParserKeyword::wildCardName("5UM*"));
BOOST_CHECK_EQUAL( true , ParserKeyword::wildCardName("U5M*"));
BOOST_CHECK_EQUAL( false , ParserKeyword::wildCardName("ABCDEFGH*"));
}
BOOST_AUTO_TEST_CASE(ParserKeyword_validDeckName) {
BOOST_CHECK_EQUAL( true , ParserKeyword::validDeckName("SUMMARY"));
BOOST_CHECK_EQUAL( false , ParserKeyword::validDeckName("MixeCase"));
@@ -108,13 +99,15 @@ BOOST_AUTO_TEST_CASE(ParserKeyword_validInternalName) {
BOOST_CHECK_EQUAL( false , ParserKeyword::validInternalName("*"));
}
BOOST_AUTO_TEST_CASE(ParserKeywordMathces) {
ParserKeywordConstPtr parserKeyword = ParserKeyword::createFixedSized("TVDP*", (size_t) 1);
BOOST_CHECK_EQUAL( true , parserKeyword->matches("TVDP"));
BOOST_CHECK_EQUAL( true , parserKeyword->matches("TVDPX"));
BOOST_CHECK_EQUAL( true , parserKeyword->matches("TVDPXY"));
BOOST_CHECK_EQUAL( false , parserKeyword->matches("TVD"));
BOOST_CHECK_EQUAL( false , parserKeyword->matches("ATVDP"));
BOOST_AUTO_TEST_CASE(ParserKeywordMatches) {
ParserKeywordPtr parserKeyword = ParserKeyword::createFixedSized("HELLO", (size_t) 1);
parserKeyword->clearDeckNames();
parserKeyword->setMatchRegex("WORLD.+");
BOOST_CHECK_EQUAL( false , parserKeyword->matches("HELLO"));
BOOST_CHECK_EQUAL( false , parserKeyword->matches("WORLD"));
BOOST_CHECK_EQUAL( true , parserKeyword->matches("WORLDABC"));
BOOST_CHECK_EQUAL( false , parserKeyword->matches("WORLD#BC"));
BOOST_CHECK_EQUAL( false , parserKeyword->matches("WORLDIAMTOOLONG"));
}
BOOST_AUTO_TEST_CASE(AddDataKeyword_correctlyConfigured) {