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

allow underscores in deck names and disallow sharps

Browse Source 
underscores are used by a few of the summary specifier keywords
(e.g. BPR_X), but after closer inspection '#' symbols are not.
This commit is contained in:
Andreas Lauser
2014-06-26 17:25:51 +02:00
parent 96904b00f4
commit fee11596f8
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
opm/parser/eclipse/Parser/ParserKeyword.cpp
View File

@@ -239,8 +239,8 @@ namespace Opm {
if (!isupper(c) &&
!isdigit(c) &&
c != '-' &&
c != '+' &&
c != '#')
c != '_' &&
c != '+')
{
return false;
}

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

@@ -73,7 +73,7 @@ BOOST_AUTO_TEST_CASE(ParserKeyword_validDeckName) {
BOOST_CHECK_EQUAL( false , ParserKeyword::validDeckName("STRING~"));
BOOST_CHECK_EQUAL( true , ParserKeyword::validDeckName("MINUS-"));
BOOST_CHECK_EQUAL( true , ParserKeyword::validDeckName("PLUS+"));
BOOST_CHECK_EQUAL( true , ParserKeyword::validDeckName("SHARP#"));
BOOST_CHECK_EQUAL( false , ParserKeyword::validDeckName("SHARP#"));
BOOST_CHECK_EQUAL( false , ParserKeyword::validDeckName("-MINUS"));
BOOST_CHECK_EQUAL( false , ParserKeyword::validDeckName("+PLUS"));
BOOST_CHECK_EQUAL( false , ParserKeyword::validDeckName("#SHARP"));