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: Speed up reading observed data file

Browse Source
This commit is contained in:
Rebecca Cox 2017-09-26 15:43:58 +02:00
parent e8d04618af
commit d8ebe508a2
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/FileInterface/RifColumnBasedRsmspecParser.cpp
View File

@ -63,14 +63,18 @@ void RifColumnBasedRsmspecParser::parseData(const QString& data)
std::vector<double> values;
QString qLine;
do
{
RifRsmspecParserTools::splitLineToDoubles(line, values);
if (values.size() != columnCount) break;
qLine = QString::fromStdString(line);
QStringList entries = qLine.split(" ", QString::SkipEmptyParts);
if (entries.size() < columnCount) break;
for (size_t i = 0; i < columnCount; i++)
{
table[i].values.push_back(values[i]);
double entry = entries.at(i).toDouble();
table[i].values.push_back(entry);
}
} while (std::getline(streamData, line));

2
ApplicationCode/FileInterface/RifKeywordVectorParser.cpp
View File

@ -51,7 +51,7 @@ bool RifKeywordVectorParser::canBeParsed(const QString& data)
while (streamData.good())
{
if (line.size() > 1 && line[0] == '-' && line[1] == '-')
if (RifRsmspecParserTools::isAComment(line))
{
std::getline(streamData, line);
}

2
ApplicationCode/FileInterface/RifRsmspecParserTools.cpp
View File

@ -67,7 +67,7 @@ bool RifRsmspecParserTools::isLineSkippable(const std::string& line)
//--------------------------------------------------------------------------------------------------
bool RifRsmspecParserTools::isAComment(const std::string& word)
{
if (word.size() > 1 && word[0] == '-' && word[1] == '-')
if (word.size() > 1 && word.substr(0, 2) == "--")
{
return true;
}