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

#1918 Observed Data : Use RifEclipseSummaryAddress when asking for timesteps

Browse Source
This commit is contained in:
Magne Sjaastad
2017-09-21 15:51:14 +02:00
parent e7f19ff89d
commit 2773c00f25
6 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/FileInterface/RifReaderEclipseSummary.cpp
View File

@@ -276,7 +276,7 @@ int RifReaderEclipseSummary::timeStepCount() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
const std::vector<time_t>& RifReaderEclipseSummary::timeSteps(size_t timeSeriesIndex) const const std::vector<time_t>& RifReaderEclipseSummary::timeSteps(const RifEclipseSummaryAddress& resultAddress) const
{ {
assert(m_ecl_sum != NULL); assert(m_ecl_sum != NULL);

7
ApplicationCode/FileInterface/RifReaderEclipseSummary.h
View File

@@ -25,11 +25,6 @@
#include <vector> #include <vector>
#include <map> #include <map>
#include "cvfObject.h"
class QDateTime;
//================================================================================================== //==================================================================================================
// //
@@ -43,7 +38,7 @@ public:
virtual bool open(const std::string& headerFileName, const std::vector<std::string>& dataFileNames) override; virtual bool open(const std::string& headerFileName, const std::vector<std::string>& dataFileNames) override;
virtual const std::vector<time_t>& timeSteps(size_t timeSeriesIndex = 0) const override; virtual const std::vector<time_t>& timeSteps(const RifEclipseSummaryAddress& resultAddress) const override;
virtual bool values(const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values) override; virtual bool values(const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values) override;
std::string unitName(const RifEclipseSummaryAddress& resultAddress) override; std::string unitName(const RifEclipseSummaryAddress& resultAddress) override;

22
ApplicationCode/FileInterface/RifReaderObservedData.cpp
View File

@@ -69,20 +69,18 @@ bool RifReaderObservedData::values(const RifEclipseSummaryAddress& resultAddress
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
const std::vector<time_t>& RifReaderObservedData::timeSteps(size_t timeSeriesIndex) const const std::vector<time_t>& RifReaderObservedData::timeSteps(const RifEclipseSummaryAddress& resultAddress) const
{ {
std::vector<time_t> timeStepsTime_t; // if (m_asciiParser)
// {
// for (QDateTime timeStep : m_asciiParser->timeSteps())
// {
// time_t t = timeStep.toTime_t();
// timeStepsTime_t.push_back(t);
// }
// }
if (m_asciiParser) return m_timeStepsTime_t;
{
for (QDateTime timeStep : m_asciiParser->timeSteps())
{
time_t t = timeStep.toTime_t();
timeStepsTime_t.push_back(t);
}
}
return timeStepsTime_t;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

3
ApplicationCode/FileInterface/RifReaderObservedData.h
View File

@@ -44,7 +44,7 @@ public:
virtual bool open(const std::string& headerFileName, const std::vector<std::string>& dataFileNames) override; virtual bool open(const std::string& headerFileName, const std::vector<std::string>& dataFileNames) override;
virtual const std::vector<time_t>& timeSteps(size_t timeSeriesIndex = 0) const override; virtual const std::vector<time_t>& timeSteps(const RifEclipseSummaryAddress& resultAddress) const override;
virtual bool values(const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values) override; virtual bool values(const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values) override;
std::string unitName(const RifEclipseSummaryAddress& resultAddress) override; std::string unitName(const RifEclipseSummaryAddress& resultAddress) override;
@@ -55,5 +55,6 @@ private:
RifEclipseSummaryAddress address(const AsciiData& asciiData, std::string identifierName, RifEclipseSummaryAddress::SummaryVarCategory summaryCategor); RifEclipseSummaryAddress address(const AsciiData& asciiData, std::string identifierName, RifEclipseSummaryAddress::SummaryVarCategory summaryCategor);
private: private:
RifColumnBasedAsciiParser* m_asciiParser; RifColumnBasedAsciiParser* m_asciiParser;
std::vector<time_t> m_timeStepsTime_t;
}; };

2
ApplicationCode/FileInterface/RifSummaryReaderInterface.h
View File

@@ -41,7 +41,7 @@ public:
bool hasAddress(const RifEclipseSummaryAddress& resultAddress); bool hasAddress(const RifEclipseSummaryAddress& resultAddress);
const std::vector<RifEclipseSummaryAddress>& allResultAddresses(); const std::vector<RifEclipseSummaryAddress>& allResultAddresses();
virtual const std::vector<time_t>& timeSteps(size_t timeSeriesIndex = 0) const = 0; virtual const std::vector<time_t>& timeSteps(const RifEclipseSummaryAddress& resultAddress) const = 0;
virtual bool values(const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values) = 0; virtual bool values(const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values) = 0;
virtual std::string unitName(const RifEclipseSummaryAddress& resultAddress) = 0; virtual std::string unitName(const RifEclipseSummaryAddress& resultAddress) = 0;

8
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp
View File

@@ -262,7 +262,8 @@ const std::vector<time_t>& RimSummaryCurve::timeSteps() const
if ( !reader ) return emptyVector; if ( !reader ) return emptyVector;
return reader->timeSteps(); RifEclipseSummaryAddress addr = m_curveVariable()->address();
return reader->timeSteps(addr);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -572,12 +573,13 @@ bool RimSummaryCurve::curveData(std::vector<QDateTime>* timeSteps, std::vector<d
if (!reader) return false; if (!reader) return false;
std::vector<time_t> times = reader->timeSteps(); RifEclipseSummaryAddress addr = m_curveVariable()->address();
std::vector<time_t> times = reader->timeSteps(addr);
*timeSteps = RifReaderEclipseSummary::fromTimeT(times); *timeSteps = RifReaderEclipseSummary::fromTimeT(times);
if (!times.size()) return false; if (!times.size()) return false;
RifEclipseSummaryAddress addr = m_curveVariable()->address();
return reader->values(addr, values); return reader->values(addr, values);
} }