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

ParserIntItem::scan() implemented with (temporary) specialized code

Browse Source
This commit is contained in:
Joakim Hove 2013-10-14 21:30:17 +02:00
parent dabfdb922b
commit 49ac9f4568
1 changed files with 41 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
opm/parser/eclipse/Parser/ParserIntItem.cpp
View File

@ -23,7 +23,7 @@
#include <opm/parser/eclipse/Parser/ParserIntItem.hpp> #include <opm/parser/eclipse/Parser/ParserIntItem.hpp>
#include <opm/parser/eclipse/Parser/ParserEnums.hpp> #include <opm/parser/eclipse/Parser/ParserEnums.hpp>
#include <opm/parser/eclipse/Deck/DeckIntItem.hpp> #include <opm/parser/eclipse/Deck/DeckIntItem.hpp>
#include <opm/parser/eclipse/RawDeck/StarToken.hpp>
namespace Opm { namespace Opm {
@ -56,22 +56,51 @@ namespace Opm {
m_defaultSet = true; m_defaultSet = true;
} }
/// Scans the rawRecords data according to the ParserItems definition. /// Scans the rawRecords data according to the ParserItems definition.
/// returns a DeckItem object. /// returns a DeckItem object.
/// NOTE: data are popped from the rawRecords deque! /// NOTE: data are popped from the rawRecords deque!
DeckItemConstPtr ParserIntItem::scan(RawRecordPtr rawRecord) const { DeckItemConstPtr ParserIntItem::scan(RawRecordPtr rawRecord) const {
DeckIntItemPtr deckItem(new DeckIntItem(name())); DeckIntItemPtr deckItem(new DeckIntItem(name()));
int defaultValue = m_default;
if (sizeType() == ALL) { // This can probably not be combined with a default value ....
// The '*' should be interpreted as a multiplication sign
while (rawRecord->size() > 0) {
std::string token = rawRecord->pop_front();
if (tokenContainsStar( token )) {
StarToken<int> st(token);
int value = defaultValue;
if (st.hasValue())
value = st.value();
deckItem->push_backMultiple( value , st.multiplier() );
} else {
int value = readValueToken<int>(token);
deckItem->push_back(value);
}
}
} else {
// The '*' should be interpreted as a default indicator
if (rawRecord->size() > 0) {
std::string token = rawRecord->pop_front();
if (tokenContainsStar( token )) {
StarToken<int> st(token);
bool scanAll = (sizeType() == ALL); if (st.hasValue()) { // Probably never true
bool defaultActive; deckItem->push_back( st.value() );
std::deque<int> intsPreparedForDeckItem = readFromRawRecord(rawRecord, scanAll, m_default, defaultActive); std::string stringValue = boost::lexical_cast<std::string>(st.value());
for (size_t i=1; i < st.multiplier(); i++)
if (scanAll) rawRecord->push_front( stringValue );
deckItem->push_back(intsPreparedForDeckItem); } else {
else { deckItem->push_backDefault( defaultValue );
deckItem->push_back(intsPreparedForDeckItem.front()); for (size_t i=1; i < st.multiplier(); i++)
intsPreparedForDeckItem.pop_front(); rawRecord->push_front( "*" );
pushBackToRecord(rawRecord, intsPreparedForDeckItem, defaultActive); }
} else {
int value = readValueToken<int>(token);
deckItem->push_back(value);
}
} else
deckItem->push_backDefault( defaultValue );
} }
return deckItem; return deckItem;
} }