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

Remove duplicate function

Browse Source
This commit is contained in:
Magne Sjaastad 2017-11-06 12:48:45 +01:00
parent 6b18493599
commit d7f70f5c9f
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationCode/FileInterface/RifEclipseUserDataParserTools.cpp
View File

@ -302,16 +302,6 @@ bool RifEclipseUserDataParserTools::hasOnlyValidDoubleValues(const std::vector<s
return onlyValidValues; return onlyValidValues;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RifEclipseUserDataParserTools::hasDateUnit(const std::string& word)
{
if (word.find("DATE") != std::string::npos) return true;
return false;
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -870,7 +860,7 @@ ColumnInfo ColumnInfo::createColumnInfo(const std::string& quantity, const std::
{ {
ColumnInfo ci(adr, unit); ColumnInfo ci(adr, unit);
if (RifEclipseUserDataParserTools::hasDateUnit(quantity)) if (RifEclipseUserDataKeywordTools::isDate(quantity))
{ {
ci.isStringData = true; ci.isStringData = true;
} }

1
ApplicationCode/FileInterface/RifEclipseUserDataParserTools.h
View File

@ -133,7 +133,6 @@ public:
static bool hasTimeUnit(const std::string& line); static bool hasTimeUnit(const std::string& line);
static bool hasOnlyValidDoubleValues(const std::vector<std::string>& words, std::vector<double>* doubleValues = nullptr); static bool hasOnlyValidDoubleValues(const std::vector<std::string>& words, std::vector<double>* doubleValues = nullptr);
static bool hasDateUnit(const std::string& word);
static bool isValidTableData(size_t columnCount, const std::string& line); static bool isValidTableData(size_t columnCount, const std::string& line);
static TableData tableDataFromText(std::stringstream& data, std::vector<std::string>* errorText = nullptr); static TableData tableDataFromText(std::stringstream& data, std::vector<std::string>* errorText = nullptr);