OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

#1816 Observed data: Add time step index to summary address

Browse Source
This commit is contained in:
Rebecca Cox
2017-09-21 12:21:52 +02:00
parent 3157346292
commit c7c06c311b
6 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationCode/FileInterface/RifEclipseSummaryAddress.h
+18 -14
View File
@@ -62,7 +62,7 @@ public:
public: public:
RifEclipseSummaryAddress(): RifEclipseSummaryAddress() :
m_variableCategory(RifEclipseSummaryAddress::SUMMARY_INVALID), m_variableCategory(RifEclipseSummaryAddress::SUMMARY_INVALID),
m_regionNumber(-1), m_regionNumber(-1),
m_regionNumber2(-1), m_regionNumber2(-1),
@@ -83,7 +83,8 @@ public:
const std::string& lgrName, const std::string& lgrName,
int cellI, int cellI,
int cellJ, int cellJ,
int cellK): int cellK,
size_t timeSeriesIndex = 0):
m_variableCategory(category), m_variableCategory(category),
m_quantityName(quantityName), m_quantityName(quantityName),
m_regionNumber(regionNumber), m_regionNumber(regionNumber),
@@ -94,7 +95,8 @@ public:
m_lgrName(lgrName), m_lgrName(lgrName),
m_cellI(cellI), m_cellI(cellI),
m_cellJ(cellJ), m_cellJ(cellJ),
m_cellK(cellK) m_cellK(cellK),
m_timeSeriesIndex(timeSeriesIndex)
{ {
} }
@@ -107,19 +109,20 @@ public:
// Access methods // Access methods
SummaryVarCategory category() const { return m_variableCategory; } SummaryVarCategory category() const { return m_variableCategory; }
const std::string& quantityName() const { return m_quantityName; } const std::string& quantityName() const { return m_quantityName; }
int regionNumber() const { return m_regionNumber; } int regionNumber() const { return m_regionNumber; }
int regionNumber2() const { return m_regionNumber2; } int regionNumber2() const { return m_regionNumber2; }
const std::string& wellGroupName() const { return m_wellGroupName; } const std::string& wellGroupName() const { return m_wellGroupName; }
const std::string& wellName() const { return m_wellName; } const std::string& wellName() const { return m_wellName; }
int wellSegmentNumber() const { return m_wellSegmentNumber; } int wellSegmentNumber() const { return m_wellSegmentNumber; }
const std::string& lgrName() const { return m_lgrName; } const std::string& lgrName() const { return m_lgrName; }
int cellI() const { return m_cellI; } int cellI() const { return m_cellI; }
int cellJ() const { return m_cellJ; } int cellJ() const { return m_cellJ; }
int cellK() const { return m_cellK; } int cellK() const { return m_cellK; }
size_t timeSeriesIndex() const { return m_timeSeriesIndex; }
// Derived properties // Derived properties
@@ -144,6 +147,7 @@ private:
int m_cellI; int m_cellI;
int m_cellJ; int m_cellJ;
int m_cellK; int m_cellK;
size_t m_timeSeriesIndex;
}; };
bool operator==(const RifEclipseSummaryAddress& first, const RifEclipseSummaryAddress& second); bool operator==(const RifEclipseSummaryAddress& first, const RifEclipseSummaryAddress& second);
ApplicationCode/FileInterface/RifReaderEclipseSummary.cpp
+1 -1
View File
@@ -276,7 +276,7 @@ int RifReaderEclipseSummary::timeStepCount() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
const std::vector<time_t>& RifReaderEclipseSummary::timeSteps() const const std::vector<time_t>& RifReaderEclipseSummary::timeSteps(size_t timeSeriesIndex) const
{ {
assert(m_ecl_sum != NULL); assert(m_ecl_sum != NULL);
ApplicationCode/FileInterface/RifReaderEclipseSummary.h
+1 -1
View File
@@ -43,7 +43,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() const override; virtual const std::vector<time_t>& timeSteps(size_t timeSeriesIndex = 0) 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;
ApplicationCode/FileInterface/RifReaderObservedData.cpp
+1 -1
View File
@@ -82,7 +82,7 @@ int RifReaderObservedData::timeStepCount() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
const std::vector<time_t>& RifReaderObservedData::timeSteps() const const std::vector<time_t>& RifReaderObservedData::timeSteps(size_t timeSeriesIndex) const
{ {
std::vector<time_t> timeStepsTime_t; std::vector<time_t> timeStepsTime_t;
ApplicationCode/FileInterface/RifReaderObservedData.h
+1 -1
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() const override; virtual const std::vector<time_t>& timeSteps(size_t timeSeriesIndex = 0) 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;
ApplicationCode/FileInterface/RifSummaryReaderInterface.h
+1 -1
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() const = 0; virtual const std::vector<time_t>& timeSteps(size_t timeSeriesIndex = 0) 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;