From c7c06c311b7975debe8cc2a9ef47d7d5ce8b81ef Mon Sep 17 00:00:00 2001 From: Rebecca Cox Date: Thu, 21 Sep 2017 09:32:10 +0200 Subject: [PATCH] #1816 Observed data: Add time step index to summary address --- .../FileInterface/RifEclipseSummaryAddress.h | 32 +++++++++++-------- .../FileInterface/RifReaderEclipseSummary.cpp | 2 +- .../FileInterface/RifReaderEclipseSummary.h | 2 +- .../FileInterface/RifReaderObservedData.cpp | 2 +- .../FileInterface/RifReaderObservedData.h | 2 +- .../FileInterface/RifSummaryReaderInterface.h | 2 +- 6 files changed, 23 insertions(+), 19 deletions(-) diff --git a/ApplicationCode/FileInterface/RifEclipseSummaryAddress.h b/ApplicationCode/FileInterface/RifEclipseSummaryAddress.h index 3148b8a92e..aaa5e410ff 100644 --- a/ApplicationCode/FileInterface/RifEclipseSummaryAddress.h +++ b/ApplicationCode/FileInterface/RifEclipseSummaryAddress.h @@ -62,7 +62,7 @@ public: public: - RifEclipseSummaryAddress(): + RifEclipseSummaryAddress() : m_variableCategory(RifEclipseSummaryAddress::SUMMARY_INVALID), m_regionNumber(-1), m_regionNumber2(-1), @@ -83,7 +83,8 @@ public: const std::string& lgrName, int cellI, int cellJ, - int cellK): + int cellK, + size_t timeSeriesIndex = 0): m_variableCategory(category), m_quantityName(quantityName), m_regionNumber(regionNumber), @@ -94,7 +95,8 @@ public: m_lgrName(lgrName), m_cellI(cellI), m_cellJ(cellJ), - m_cellK(cellK) + m_cellK(cellK), + m_timeSeriesIndex(timeSeriesIndex) { } @@ -107,19 +109,20 @@ public: // Access methods - SummaryVarCategory category() const { return m_variableCategory; } - const std::string& quantityName() const { return m_quantityName; } + SummaryVarCategory category() const { return m_variableCategory; } + const std::string& quantityName() const { return m_quantityName; } - int regionNumber() const { return m_regionNumber; } - int regionNumber2() const { return m_regionNumber2; } + int regionNumber() const { return m_regionNumber; } + int regionNumber2() const { return m_regionNumber2; } - const std::string& wellGroupName() const { return m_wellGroupName; } - const std::string& wellName() const { return m_wellName; } - int wellSegmentNumber() const { return m_wellSegmentNumber; } - const std::string& lgrName() const { return m_lgrName; } - int cellI() const { return m_cellI; } - int cellJ() const { return m_cellJ; } - int cellK() const { return m_cellK; } + const std::string& wellGroupName() const { return m_wellGroupName; } + const std::string& wellName() const { return m_wellName; } + int wellSegmentNumber() const { return m_wellSegmentNumber; } + const std::string& lgrName() const { return m_lgrName; } + int cellI() const { return m_cellI; } + int cellJ() const { return m_cellJ; } + int cellK() const { return m_cellK; } + size_t timeSeriesIndex() const { return m_timeSeriesIndex; } // Derived properties @@ -144,6 +147,7 @@ private: int m_cellI; int m_cellJ; int m_cellK; + size_t m_timeSeriesIndex; }; bool operator==(const RifEclipseSummaryAddress& first, const RifEclipseSummaryAddress& second); diff --git a/ApplicationCode/FileInterface/RifReaderEclipseSummary.cpp b/ApplicationCode/FileInterface/RifReaderEclipseSummary.cpp index 004341c7d6..cc6c402472 100644 --- a/ApplicationCode/FileInterface/RifReaderEclipseSummary.cpp +++ b/ApplicationCode/FileInterface/RifReaderEclipseSummary.cpp @@ -276,7 +276,7 @@ int RifReaderEclipseSummary::timeStepCount() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -const std::vector& RifReaderEclipseSummary::timeSteps() const +const std::vector& RifReaderEclipseSummary::timeSteps(size_t timeSeriesIndex) const { assert(m_ecl_sum != NULL); diff --git a/ApplicationCode/FileInterface/RifReaderEclipseSummary.h b/ApplicationCode/FileInterface/RifReaderEclipseSummary.h index bc9840c07b..1e3a6d3bc7 100644 --- a/ApplicationCode/FileInterface/RifReaderEclipseSummary.h +++ b/ApplicationCode/FileInterface/RifReaderEclipseSummary.h @@ -43,7 +43,7 @@ public: virtual bool open(const std::string& headerFileName, const std::vector& dataFileNames) override; - virtual const std::vector& timeSteps() const override; + virtual const std::vector& timeSteps(size_t timeSeriesIndex = 0) const override; virtual bool values(const RifEclipseSummaryAddress& resultAddress, std::vector* values) override; std::string unitName(const RifEclipseSummaryAddress& resultAddress) override; diff --git a/ApplicationCode/FileInterface/RifReaderObservedData.cpp b/ApplicationCode/FileInterface/RifReaderObservedData.cpp index 286c062d62..c1f4af4b03 100644 --- a/ApplicationCode/FileInterface/RifReaderObservedData.cpp +++ b/ApplicationCode/FileInterface/RifReaderObservedData.cpp @@ -82,7 +82,7 @@ int RifReaderObservedData::timeStepCount() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -const std::vector& RifReaderObservedData::timeSteps() const +const std::vector& RifReaderObservedData::timeSteps(size_t timeSeriesIndex) const { std::vector timeStepsTime_t; diff --git a/ApplicationCode/FileInterface/RifReaderObservedData.h b/ApplicationCode/FileInterface/RifReaderObservedData.h index fd42e9dcd7..70f9005dd9 100644 --- a/ApplicationCode/FileInterface/RifReaderObservedData.h +++ b/ApplicationCode/FileInterface/RifReaderObservedData.h @@ -44,7 +44,7 @@ public: virtual bool open(const std::string& headerFileName, const std::vector& dataFileNames) override; - virtual const std::vector& timeSteps() const override; + virtual const std::vector& timeSteps(size_t timeSeriesIndex = 0) const override; virtual bool values(const RifEclipseSummaryAddress& resultAddress, std::vector* values) override; std::string unitName(const RifEclipseSummaryAddress& resultAddress) override; diff --git a/ApplicationCode/FileInterface/RifSummaryReaderInterface.h b/ApplicationCode/FileInterface/RifSummaryReaderInterface.h index 2a0baa815a..70c376832a 100644 --- a/ApplicationCode/FileInterface/RifSummaryReaderInterface.h +++ b/ApplicationCode/FileInterface/RifSummaryReaderInterface.h @@ -41,7 +41,7 @@ public: bool hasAddress(const RifEclipseSummaryAddress& resultAddress); const std::vector& allResultAddresses(); - virtual const std::vector& timeSteps() const = 0; + virtual const std::vector& timeSteps(size_t timeSeriesIndex = 0) const = 0; virtual bool values(const RifEclipseSummaryAddress& resultAddress, std::vector* values) = 0; virtual std::string unitName(const RifEclipseSummaryAddress& resultAddress) = 0;