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 : Compare first time step when merging

Browse Source
This commit is contained in:
Magne Sjaastad
2017-11-07 12:33:22 +01:00
parent b022492bc1
commit e9a938ce78
2 changed files with 72 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
ApplicationCode/FileInterface/RifEclipseUserDataParserTools.cpp
View File

@@ -813,17 +813,22 @@ std::vector<TableData> RifEclipseUserDataParserTools::mergeEqualTimeSteps(const
if (tables[0].columnInfos().size() == 0) return tables;
ColumnInfo* dateColumn = nullptr;
QDateTime firstTableStartTime;
for (auto c : tables[0].columnInfos())
{
if (c.summaryAddress.quantityName() == "DATE")
{
dateColumn = &c;
if (c.stringValues.size() > 0)
{
firstTableStartTime = RiaDateStringParser::parseDateString(c.stringValues[0]);
}
}
}
// Support only merge of tables with the DATE column present
if (!dateColumn) return tables;
if (!firstTableStartTime.isValid())
{
return tables;
}
std::vector<TableData> largeTables;
@@ -834,8 +839,31 @@ std::vector<TableData> RifEclipseUserDataParserTools::mergeEqualTimeSteps(const
for (size_t i = 1; i < tables.size(); i++)
{
bool isDatesEqual = true;
if (firstTableStartTime.isValid())
{
QDateTime tableFirstTime;
for (auto& c : tables[i].columnInfos())
{
if (c.summaryAddress.quantityName() == "DATE")
{
if (c.stringValues.size() > 0)
{
tableFirstTime = RiaDateStringParser::parseDateString(c.stringValues[0]);
}
}
}
if (firstTableStartTime != tableFirstTime)
{
isDatesEqual = false;
}
}
if (tables[i].columnInfos().size() > 0 &&
tables[i].columnInfos()[0].itemCount() == itemsInFirstTable)
tables[i].columnInfos()[0].itemCount() == itemsInFirstTable &&
isDatesEqual)
{
for (auto& c : tables[i].columnInfos())
{