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

ParserIntItem can handle sizeType == ALL

Browse Source
This commit is contained in:
Joakim Hove
2013-05-12 21:38:14 +02:00
parent f178691831
commit 0524ac040f
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,14 +46,25 @@ namespace Opm {
{
DeckIntItemPtr deckItem(new DeckIntItem());
if (expectedItems) {
if (expectedItems || scanAll) {
std::vector<int> intsPreparedForDeckItem;
bool defaultActive;
do {
std::string token = rawRecord->pop_front();
fillIntVectorFromStringToken(token, intsPreparedForDeckItem , defaultActive);
} while (((intsPreparedForDeckItem.size() < expectedItems) || scanAll) && (rawRecord->getItems().size() > 0U));
{
bool cont = true;
do {
std::string token = rawRecord->pop_front();
fillIntVectorFromStringToken(token, intsPreparedForDeckItem , defaultActive);
if (rawRecord->size() == 0)
cont = false;
else {
if (!scanAll)
if (intsPreparedForDeckItem.size() >= expectedItems)
cont = false;
}
} while (cont);
}
if (intsPreparedForDeckItem.size() >= expectedItems) {
if (scanAll)
@@ -96,7 +107,7 @@ namespace Opm {
DeckIntItemPtr ParserIntItem::scan(RawRecordPtr rawRecord) {
if (sizeType() == SCALAR)
return scan(1U , rawRecord);
else if (sizeType() == ALL)
else if (sizeType() == ALL)
return scan__(0 , true , rawRecord);
else
throw std::invalid_argument("Unsupported size type, only support SCALAR. Use scan( numTokens , rawRecord) instead ");