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 : Use epoch as start date when no date is present

Browse Source
This commit is contained in:
Magne Sjaastad
2017-11-07 07:39:44 +01:00
parent 222bf38d58
commit d45ca19af4
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ApplicationCode/FileInterface/RifEclipseUserDataParserTools.cpp
View File

@@ -20,6 +20,7 @@
#include "RiaDateStringParser.h" #include "RiaDateStringParser.h"
#include "RiaLogging.h" #include "RiaLogging.h"
#include "RiaQDateTimeTools.h"
#include "RiaStdStringTools.h" #include "RiaStdStringTools.h"
#include "RifEclipseUserDataKeywordTools.h" #include "RifEclipseUserDataKeywordTools.h"
@@ -917,7 +918,7 @@ ColumnInfo ColumnInfo::createColumnInfo(const std::string& quantity, const std::
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QDateTime TableData::findFirstDate() const QDateTime TableData::findFirstDate() const
{ {
QDateTime dt; QDateTime dt = RiaQDateTimeTools::epoch();
for (auto ci : m_columnInfos) for (auto ci : m_columnInfos)
{ {
@@ -927,7 +928,11 @@ QDateTime TableData::findFirstDate() const
{ {
std::string firstDateString = ci.stringValues[0]; std::string firstDateString = ci.stringValues[0];
dt = RiaDateStringParser::parseDateString(firstDateString); QDateTime candidate = RiaDateStringParser::parseDateString(firstDateString);
if (candidate.isValid())
{
dt = candidate;
}
} }
} }
} }

14
ApplicationCode/UnitTests/ObservedDataParser-Test.cpp
View File

@@ -366,9 +366,6 @@ TEST(RifColumnBasedRsmspecParserTest, TestTableValues)
ASSERT_EQ(size_t(18), tables.at(0).columnInfos().at(0).values.size()); ASSERT_EQ(size_t(18), tables.at(0).columnInfos().at(0).values.size());
ASSERT_EQ(size_t(4), tables.at(1).columnInfos().at(0).values.size()); ASSERT_EQ(size_t(4), tables.at(1).columnInfos().at(0).values.size());
// EXPECT_TRUE(tables.at(0).columnInfos().at(2).isAVector);
// EXPECT_FALSE(tables.at(1).columnInfos().at(0).isAVector);
EXPECT_EQ(0.0, tables.at(0).columnInfos().at(1).values.at(6)); EXPECT_EQ(0.0, tables.at(0).columnInfos().at(1).values.at(6));
EXPECT_EQ(282.0, tables.at(0).columnInfos().at(3).values.at(6)); EXPECT_EQ(282.0, tables.at(0).columnInfos().at(3).values.at(6));
@@ -379,6 +376,17 @@ TEST(RifColumnBasedRsmspecParserTest, TestTableValues)
EXPECT_EQ("P-15P", tables.at(0).columnInfos().at(5).summaryAddress.wellName()); EXPECT_EQ("P-15P", tables.at(0).columnInfos().at(5).summaryAddress.wellName());
EXPECT_EQ("P-9P", tables.at(1).columnInfos().at(1).summaryAddress.wellName()); EXPECT_EQ("P-9P", tables.at(1).columnInfos().at(1).summaryAddress.wellName());
EXPECT_NE("P-9P", tables.at(1).columnInfos().at(0).summaryAddress.wellName()); EXPECT_NE("P-9P", tables.at(1).columnInfos().at(0).summaryAddress.wellName());
RifColumnBasedUserData userData;
userData.parse(data);
RifEclipseSummaryAddress adr(RifEclipseSummaryAddress::SUMMARY_WELL, "WLVP", -1, -1, "", "P-15P", -1, "", -1, -1, -1);
QDateTime firstTimeStep = RiaQDateTimeTools::addDays(RiaQDateTimeTools::epoch(), 1.0);
auto timeSteps = userData.timeSteps(adr);
EXPECT_EQ(size_t(18), timeSteps.size());
EXPECT_EQ(firstTimeStep.toTime_t(), timeSteps[0]);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------