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

#1839 Observed Data : Added const to RifSummaryReaderInterface

Browse Source
This commit is contained in:
Magne Sjaastad
2017-09-22 14:59:47 +02:00
parent eb744f381d
commit eb8dbb1b86
9 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/FileInterface/RifReaderEclipseSummary.cpp
View File

@@ -236,7 +236,7 @@ RifEclipseSummaryAddress addressFromErtSmSpecNode(const smspec_node_type * ertSu
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RifReaderEclipseSummary::values(const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values) bool RifReaderEclipseSummary::values(const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values) const
{ {
assert(m_ecl_sum != NULL); assert(m_ecl_sum != NULL);
@@ -288,7 +288,7 @@ const std::vector<time_t>& RifReaderEclipseSummary::timeSteps(const RifEclipseSu
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
int RifReaderEclipseSummary::indexFromAddress(const RifEclipseSummaryAddress& resultAddress) int RifReaderEclipseSummary::indexFromAddress(const RifEclipseSummaryAddress& resultAddress) const
{ {
auto it = m_resultAddressToErtNodeIdx.find(resultAddress); auto it = m_resultAddressToErtNodeIdx.find(resultAddress);
if (it != m_resultAddressToErtNodeIdx.end()) if (it != m_resultAddressToErtNodeIdx.end())
@@ -324,7 +324,7 @@ void RifReaderEclipseSummary::buildMetaData()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::string RifReaderEclipseSummary::unitName(const RifEclipseSummaryAddress& resultAddress) std::string RifReaderEclipseSummary::unitName(const RifEclipseSummaryAddress& resultAddress) const
{ {
if (!m_ecl_SmSpec) return ""; if (!m_ecl_SmSpec) return "";

6
ApplicationCode/FileInterface/RifReaderEclipseSummary.h
View File

@@ -40,12 +40,12 @@ public:
virtual const std::vector<time_t>& timeSteps(const RifEclipseSummaryAddress& resultAddress) 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) const override;
std::string unitName(const RifEclipseSummaryAddress& resultAddress) override; virtual std::string unitName(const RifEclipseSummaryAddress& resultAddress) const override;
private: private:
int timeStepCount() const; int timeStepCount() const;
int indexFromAddress(const RifEclipseSummaryAddress& resultAddress); int indexFromAddress(const RifEclipseSummaryAddress& resultAddress) const;
void buildMetaData(); void buildMetaData();
private: private:

4
ApplicationCode/FileInterface/RifReaderObservedData.cpp
View File

@@ -86,7 +86,7 @@ bool RifReaderObservedData::open(const QString& headerFileName,
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RifReaderObservedData::values(const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values) bool RifReaderObservedData::values(const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values) const
{ {
size_t columnIndex = m_allResultAddresses.size(); size_t columnIndex = m_allResultAddresses.size();
@@ -164,7 +164,7 @@ RifEclipseSummaryAddress RifReaderObservedData::address(const QString& quantity,
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::string RifReaderObservedData::unitName(const RifEclipseSummaryAddress& resultAddress) std::string RifReaderObservedData::unitName(const RifEclipseSummaryAddress& resultAddress) const
{ {
std::string str = ""; std::string str = "";
return str; return str;

4
ApplicationCode/FileInterface/RifReaderObservedData.h
View File

@@ -49,9 +49,9 @@ public:
virtual const std::vector<time_t>& timeSteps(const RifEclipseSummaryAddress& resultAddress) const override; virtual const std::vector<time_t>& timeSteps(const RifEclipseSummaryAddress& resultAddress) const override;
virtual bool values(const RifEclipseSummaryAddress& resultAddress, virtual bool values(const RifEclipseSummaryAddress& resultAddress,
std::vector<double>* values) override; std::vector<double>* values) const override;
std::string unitName(const RifEclipseSummaryAddress& resultAddress) override; std::string unitName(const RifEclipseSummaryAddress& resultAddress) const override;
private: private:
RifEclipseSummaryAddress address(const QString& quantity, RifEclipseSummaryAddress address(const QString& quantity,

6
ApplicationCode/FileInterface/RifSummaryReaderInterface.cpp
View File

@@ -26,7 +26,7 @@
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
const std::vector<RifEclipseSummaryAddress>& RifSummaryReaderInterface::allResultAddresses() const std::vector<RifEclipseSummaryAddress>& RifSummaryReaderInterface::allResultAddresses() const
{ {
return m_allResultAddresses; return m_allResultAddresses;
} }
@@ -50,9 +50,9 @@ std::vector<QDateTime> RifSummaryReaderInterface::fromTimeT(const std::vector<ti
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RifSummaryReaderInterface::hasAddress(const RifEclipseSummaryAddress& resultAddress) bool RifSummaryReaderInterface::hasAddress(const RifEclipseSummaryAddress& resultAddress) const
{ {
for (RifEclipseSummaryAddress summaryAddress : m_allResultAddresses) for (const RifEclipseSummaryAddress& summaryAddress : m_allResultAddresses)
{ {
if (summaryAddress == resultAddress) if (summaryAddress == resultAddress)
{ {

20
ApplicationCode/FileInterface/RifSummaryReaderInterface.h
View File

@@ -20,16 +20,15 @@
#include "RifEclipseSummaryAddress.h" #include "RifEclipseSummaryAddress.h"
#include "cvfObject.h"
#include <string> #include <string>
#include <vector> #include <vector>
#include <map> #include <map>
#include "cvfObject.h"
class QDateTime; class QDateTime;
//================================================================================================== //==================================================================================================
// //
// //
@@ -37,13 +36,15 @@ class QDateTime;
class RifSummaryReaderInterface : public cvf::Object class RifSummaryReaderInterface : public cvf::Object
{ {
public: public:
bool hasAddress(const RifEclipseSummaryAddress& resultAddress); bool hasAddress(const RifEclipseSummaryAddress& resultAddress) const;
const std::vector<RifEclipseSummaryAddress>& allResultAddresses(); const std::vector<RifEclipseSummaryAddress>& allResultAddresses() const;
virtual const std::vector<time_t>& timeSteps(const RifEclipseSummaryAddress& resultAddress) const = 0;
virtual bool values(const RifEclipseSummaryAddress& resultAddress,
std::vector<double>* values) = 0;
virtual std::string unitName(const RifEclipseSummaryAddress& resultAddress) = 0; virtual const std::vector<time_t>& timeSteps(const RifEclipseSummaryAddress& resultAddress) const = 0;
virtual bool values(const RifEclipseSummaryAddress& resultAddress,
std::vector<double>* values) const = 0;
virtual std::string unitName(const RifEclipseSummaryAddress& resultAddress) const = 0;
// TODO: Move this to a tools class with static members // TODO: Move this to a tools class with static members
static std::vector<QDateTime> fromTimeT(const std::vector<time_t>& timeSteps); static std::vector<QDateTime> fromTimeT(const std::vector<time_t>& timeSteps);
@@ -51,4 +52,3 @@ public:
protected: protected:
std::vector<RifEclipseSummaryAddress> m_allResultAddresses; std::vector<RifEclipseSummaryAddress> m_allResultAddresses;
}; };

1
ApplicationCode/ProjectDataModel/Summary/RimObservedData.cpp
View File

@@ -17,6 +17,7 @@
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
#include "RimObservedData.h" #include "RimObservedData.h"
#include "RimTools.h" #include "RimTools.h"
#include <QFileInfo> #include <QFileInfo>

1
ApplicationCode/ProjectDataModel/Summary/RimObservedData.h
View File

@@ -42,6 +42,7 @@ public:
QString identifierName() const; QString identifierName() const;
RifEclipseSummaryAddress::SummaryVarCategory summaryCategory() const; RifEclipseSummaryAddress::SummaryVarCategory summaryCategory() const;
private: private:
caf::PdmField<caf::AppEnum<RifEclipseSummaryAddress::SummaryVarCategory> > m_summaryCategory; caf::PdmField<caf::AppEnum<RifEclipseSummaryAddress::SummaryVarCategory> > m_summaryCategory;
caf::PdmField<QString> m_identifierName; caf::PdmField<QString> m_identifierName;

4
ApplicationCode/ProjectDataModel/Summary/RimObservedRsmspecColumnBasedData.cpp
View File

@@ -65,7 +65,7 @@ public:
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
virtual bool values(const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values) override virtual bool values(const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values) const override
{ {
values->push_back(20); values->push_back(20);
values->push_back(40); values->push_back(40);
@@ -79,7 +79,7 @@ public:
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
virtual std::string unitName(const RifEclipseSummaryAddress& resultAddress) override virtual std::string unitName(const RifEclipseSummaryAddress& resultAddress) const override
{ {
return "Unknown unit"; return "Unknown unit";
} }