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

#1941 Observed Data : Add RiaDateTimeTools

Browse Source
This commit is contained in:
Magne Sjaastad
2017-09-28 08:04:27 +02:00
parent 00ef13094a
commit 9364efa4b7
6 changed files with 108 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationCode/FileInterface/RifColumnBasedUserData.cpp
View File

@@ -18,6 +18,7 @@
#include "RifColumnBasedUserData.h"
#include "RiaDateTimeTools.h"
#include "RiaLogging.h"
#include "RifColumnBasedUserDataParser.h"
@@ -89,18 +90,7 @@ bool RifColumnBasedUserData::parse(const QString& data)
m_timeSteps.resize(m_timeSteps.size() + 1);
double scaleFactor = 1.0;
QString unitText = QString::fromStdString(ci.unitName);
if (unitText.compare("DAYS", Qt::CaseInsensitive) == 0)
{
scaleFactor = 60.0 * 60.0 * 24.0;
}
else if (unitText.compare("YEARS", Qt::CaseInsensitive) == 0)
{
scaleFactor = 60.0 * 60.0 * 24.0 * 365.0;
}
quint64 scaleFactor = RiaDateTimeTools::secondsFromUnit(ci.unitName);
std::vector<time_t>& timeSteps = m_timeSteps.back();
{
for (auto v : ci.values)

39
ApplicationCode/FileInterface/RifKeywordVectorUserData.cpp
View File

@@ -18,6 +18,7 @@
#include "RifKeywordVectorUserData.h"
#include "RiaDateTimeTools.h"
#include "RiaLogging.h"
#include "RifEclipseSummaryAddress.h"
@@ -93,21 +94,19 @@ bool RifKeywordVectorUserData::parse(const QString& data)
if (isTimeHeader(keyValuePairs))
{
QString unitText = valueForKey(keyValuePairs, "UNITS");
if (unitText.compare("YEAR", Qt::CaseInsensitive) == 0)
quint64 scaleFactor = RiaDateTimeTools::secondsFromUnit(unitText.toStdString());
std::vector<time_t> ts;
for (const auto& year : m_parser->keywordBasedVectors()[i].values)
{
std::vector<time_t> ts;
for (const auto& year : m_parser->keywordBasedVectors()[i].values)
{
ts.push_back(secondsSinceEpochForYear(year));
}
m_timeSteps.push_back(ts);
QString originText = valueForKey(keyValuePairs, "ORIGIN");
m_mapFromOriginToTimeStepIndex[originText] = m_timeSteps.size() - 1;
ts.push_back(scaleFactor * year);
}
m_timeSteps.push_back(ts);
QString originText = valueForKey(keyValuePairs, "ORIGIN");
m_mapFromOriginToTimeStepIndex[originText] = m_timeSteps.size() - 1;
}
}
@@ -238,17 +237,3 @@ QString RifKeywordVectorUserData::valueForKey(const std::map<QString, QString>&
return "";
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RifKeywordVectorUserData::secondsSinceEpochForYear(double year)
{
static double secondsPerDay = 60.0 * 60.0* 24.0;
static double secondsPerYear = secondsPerDay * 365.0;
double yearsSinceEphoch = year - 1970.0;
double secondsSinceEpoch = yearsSinceEphoch * secondsPerYear;
return secondsSinceEpoch;
}

2
ApplicationCode/FileInterface/RifKeywordVectorUserData.h
View File

@@ -56,8 +56,6 @@ private:
static bool isVectorHeader(const std::map<QString, QString>& header);
static QString valueForKey(const std::map<QString, QString>& header, const QString& key);
static double secondsSinceEpochForYear(double year);
private:
std::unique_ptr<RifKeywordVectorParser> m_parser;