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

#2139, #2126 Add available times convenience access in RftReader, Rename enum in RifEclipseRftAddress

Browse Source
This commit is contained in:
Jacob Støren
2017-11-13 15:17:49 +01:00
parent 8bea278d20
commit c670878b33
6 changed files with 60 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/FileInterface/RifEclipseRftAddress.cpp
View File

@@ -21,8 +21,8 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifEclipseRftAddress::RifEclipseRftAddress(QString wellName, QDateTime timeStep, RftWellLogChannelName wellLogChannelName) :
m_wellName(wellName), m_wellLogChannelName(wellLogChannelName)
RifEclipseRftAddress::RifEclipseRftAddress(QString wellName, QDateTime timeStep, RftWellLogChannelType wellLogChannelName) :
m_wellName(wellName), m_wellLogChannel(wellLogChannelName)
{
timeStep.setTimeSpec(Qt::TimeSpec::UTC);
@@ -37,7 +37,7 @@ bool operator==(const RifEclipseRftAddress& first, const RifEclipseRftAddress& s
{
if (first.wellName() != second.wellName()) return false;
if (first.timeStep() != second.timeStep()) return false;
if (first.wellLogChannelName() != second.wellLogChannelName()) return false;
if (first.wellLogChannel() != second.wellLogChannel()) return false;
return true;
}
@@ -49,7 +49,7 @@ bool operator<(const RifEclipseRftAddress& first, const RifEclipseRftAddress& se
{
if (first.wellName() != second.wellName()) return (first.wellName() < second.wellName());
if (first.timeStep() != second.timeStep()) return (first.timeStep() < second.timeStep());
if (first.wellLogChannelName() != second.wellLogChannelName()) return (first.wellLogChannelName() < second.wellLogChannelName());
if (first.wellLogChannel() != second.wellLogChannel()) return (first.wellLogChannel() < second.wellLogChannel());
return false;
}