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

separate the internal keyword names and the deck names more clearly

Browse Source 
so far, these two concepts were partially mingled in Opm::Parser...
This commit is contained in:
Andreas Lauser
2014-06-27 16:42:54 +02:00
parent 09c5a24473
commit fe638c2fc8
8 changed files with 112 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -530,12 +530,8 @@ namespace Opm {
bool ParserKeyword::equal(const ParserKeyword& other) const {
// compare the deck names. we don't care about the ordering of the strings.
for (auto deckNameIt = m_deckNames.begin(); deckNameIt != m_deckNames.end(); ++deckNameIt)
if (!other.m_deckNames.count(*deckNameIt))
return false;
for (auto deckNameIt = other.m_deckNames.begin(); deckNameIt != other.m_deckNames.end(); ++deckNameIt)
if (!m_deckNames.count(*deckNameIt))
return false;
if (m_deckNames != other.m_deckNames)
return false;
if ((m_name == other.m_name) &&
(m_matchRegexString == other.m_matchRegexString) &&