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

#1942 HDF5 reader. Using RiaQDateTimeTools for parts of the reading. See issue comment for more info

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2017-11-30 13:41:33 +01:00
parent c86161a0a6
commit da11a32862
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/Application/Tools/RiaQDateTimeTools.cpp
View File

@@ -72,6 +72,14 @@ QDateTime RiaQDateTimeTools::fromYears(double years)
return RiaQDateTimeTools::addYears(dt, yearsAfterEpoch); return RiaQDateTimeTools::addYears(dt, yearsAfterEpoch);
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QDateTime RiaQDateTimeTools::addMSecs(const QDateTime& dt, double msecs)
{
return dt.addMSecs(msecs);
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

1
ApplicationCode/Application/Tools/RiaQDateTimeTools.h
View File

@@ -38,6 +38,7 @@ public:
static QDateTime fromString(const QString& dateString, const QString& format); static QDateTime fromString(const QString& dateString, const QString& format);
static QDateTime fromYears(double years); static QDateTime fromYears(double years);
static QDateTime addMSecs(const QDateTime& dt, double msecs);
static QDateTime addDays(const QDateTime& dt, double days); static QDateTime addDays(const QDateTime& dt, double days);
static QDateTime addYears(const QDateTime& dt, double years); static QDateTime addYears(const QDateTime& dt, double years);

6
ApplicationCode/FileInterface/RifHdf5Reader.cpp
View File

@@ -121,8 +121,6 @@ std::vector<QDateTime> RifHdf5Reader::timeSteps() const
QDateTime dtInitial = sourSimDateTimeToQDateTime(dateString); QDateTime dtInitial = sourSimDateTimeToQDateTime(dateString);
int secondsPerDay = 60 * 60 * 24;
for (size_t i = 0; i < m_timeStepFileNames.size(); i++) for (size_t i = 0; i < m_timeStepFileNames.size(); i++)
{ {
std::string fileName = m_timeStepFileNames[i]; std::string fileName = m_timeStepFileNames[i];
@@ -137,8 +135,8 @@ std::vector<QDateTime> RifHdf5Reader::timeSteps() const
double milliseconds = fractionOfDay * 24.0 * 60.0 * 60.0 * 1000.0; double milliseconds = fractionOfDay * 24.0 * 60.0 * 60.0 * 1000.0;
QDateTime dt = dtInitial; QDateTime dt = dtInitial;
dt = dt.addDays(timeStepDays); dt = RiaQDateTimeTools::addDays(dt, timeStepDays);
dt = dt.addMSecs(milliseconds); dt = RiaQDateTimeTools::addMSecs(dt, milliseconds);
times.push_back(dt); times.push_back(dt);
} }