OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#1933 Observed data: Sets restOfHeader correctly

Browse Source
This commit is contained in:
Rebecca Cox
2017-09-27 09:32:06 +02:00
parent 802a9154e4
commit 88902e8f03
2 changed files with 70 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ApplicationCode/FileInterface/RifRsmspecParserTools.cpp
View File

@@ -58,7 +58,11 @@ bool RifRsmspecParserTools::isLineSkippable(const std::string& line)
{
return true;
}
if (str.find("NULL") < str.size())
{
return true;
}
return false;
}
@@ -286,12 +290,10 @@ std::vector<ColumnInfo> RifRsmspecParserTools::columnInfoForTable(std::stringstr
table.push_back(columnInfo);
}
if (scaleFactors.empty())
if (scaleFactors.size() < columnCount)
{
for (size_t i = 0; i < table.size(); i++)
{
scaleFactors.push_back("1");
}
size_t diff = columnCount - scaleFactors.size();
scaleFactors.insert(scaleFactors.end(), diff, "1");
}
for (size_t i = 0; i < table.size(); i++)
@@ -328,9 +330,8 @@ std::vector<ColumnInfo> RifRsmspecParserTools::columnInfoForTable(std::stringstr
}
else
{
std::vector< std::string > wordsWithEmptyStrings(diff, "");
wordsWithEmptyStrings.insert(wordsWithEmptyStrings.begin(), words.begin(), words.end());
restOfHeader.push_back(wordsWithEmptyStrings);
words.insert(words.begin(), diff, "");
restOfHeader.push_back(words);
}
}
}