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 Observed Data : Add basic support for fixed width in parser

Browse Source
This commit is contained in:
Magne Sjaastad
2017-11-03 16:08:23 +01:00
parent 50b2717ed2
commit f50760bb35
4 changed files with 43 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
ApplicationCode/FileInterface/RifEclipseUserDataParserTools.cpp
View File

@@ -503,11 +503,7 @@ TableData RifEclipseUserDataParserTools::tableDataFromText(std::stringstream& st
RifEclipseSummaryAddress adr = RifEclipseUserDataKeywordTools::makeAndFillAddress(quantity, columnHeader);
ColumnInfo ci(adr, unit);
if (quantity == "DATE")
{
ci.isStringData = true;
}
ColumnInfo ci = ColumnInfo::createColumnInfo(quantity, unit, adr);
columnInfos.push_back(ci);
}
@@ -728,28 +724,11 @@ std::vector<ColumnInfo> RifEclipseUserDataParserTools::columnInfoFromColumnHeade
RifEclipseSummaryAddress adr = RifEclipseUserDataKeywordTools::makeAndFillAddress(quantity, restOfHeader);
ColumnInfo columnInfo;
columnInfo.unitName = unit;
ColumnInfo ci = ColumnInfo::createColumnInfo(quantity, unit, adr);
// if (hasDateUnit(unit) ||
// hasDateUnit(quantity))
// {
// columnInfo.isAVector = false;
// }
// else
// {
// columnInfo.isAVector = true;
// }
//columnInfo.origin = origin;
//columnInfo.dateFormatString = dateFormat;
//columnInfo.startDateString = startDate;
columnInfo.summaryAddress = adr;
table.push_back(columnInfo);
table.push_back(ci);
}
return table;
}
@@ -859,3 +838,17 @@ bool RifEclipseUserDataParserTools::isUnitText(const std::string& word)
return false;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
ColumnInfo ColumnInfo::createColumnInfo(const std::string& quantity, const std::string& unit, const RifEclipseSummaryAddress& adr)
{
ColumnInfo ci(adr, unit);
if (RifEclipseUserDataParserTools::hasDateUnit(quantity))
{
ci.isStringData = true;
}
return ci;
}