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

#2003 Move conversion from string to double into RiaStdStringTools

Browse Source
This commit is contained in:
Magne Sjaastad
2017-11-03 15:26:56 +01:00
parent 713998fb38
commit 50b2717ed2
4 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ApplicationCode/FileInterface/RifEclipseUserDataParserTools.cpp
View File

@@ -20,6 +20,7 @@
#include "RiaDateStringParser.h"
#include "RiaLogging.h"
#include "RiaStdStringTools.h"
#include "RifEclipseUserDataKeywordTools.h"
@@ -283,8 +284,6 @@ bool RifEclipseUserDataParserTools::hasTimeUnit(const std::string& word)
//--------------------------------------------------------------------------------------------------
bool RifEclipseUserDataParserTools::hasOnlyValidDoubleValues(const std::vector<std::string>& words, std::vector<double>* doubleValues)
{
char* end;
bool onlyValidValues = true;
for (const auto& word : words)
@@ -295,7 +294,7 @@ bool RifEclipseUserDataParserTools::hasOnlyValidDoubleValues(const std::vector<s
}
else
{
double doubleVal = strtod(word.data(), &end);
double doubleVal = RiaStdStringTools::toDouble(word);
doubleValues->push_back(doubleVal);
}
}

4
ApplicationCode/FileInterface/RifKeywordVectorParser.cpp
View File

@@ -18,6 +18,8 @@
#include "RifKeywordVectorParser.h"
#include "RiaStdStringTools.h"
#include "RifEclipseUserDataParserTools.h"
#include "cvfAssert.h"
@@ -90,7 +92,7 @@ void RifKeywordVectorParser::parseData(const QString& data)
while (RifEclipseUserDataParserTools::isANumber(line))
{
keywordBasedVector.values.push_back(std::stod(line));
keywordBasedVector.values.push_back(RiaStdStringTools::toDouble(line));
std::getline(streamData, line);
}