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

#2032 Curve Calculator : Rename of calculation and calculation collection

Browse Source
This commit is contained in:
Magne Sjaastad
2017-10-23 14:42:38 +02:00
parent f943a80f95
commit 35a2769cab
16 changed files with 75 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationCode/ProjectDataModel/Summary/RimCalculatedSummaryCase.cpp
+3 -3
View File
@@ -19,7 +19,7 @@
#include "RimCalculatedSummaryCase.h"
#include "RimSummaryCalculation.h"
#include "RimCalculationCollection.h"
#include "RimSummaryCalculationCollection.h"
CAF_PDM_SOURCE_INIT(RimCalculatedSummaryCase,"CalculatedSummaryCase");
@@ -55,7 +55,7 @@ void RimCalculatedSummaryCase::createSummaryReaderInterface()
{
if (!m_calculatedCurveReader)
{
RimCalculationCollection* calculationCollection = nullptr;
RimSummaryCalculationCollection* calculationCollection = nullptr;
this->firstAncestorOrThisOfTypeAsserted(calculationCollection);
m_calculatedCurveReader = new RifCalculatedSummaryCurveReader(calculationCollection);
@@ -100,7 +100,7 @@ void RimCalculatedSummaryCase::buildMetaData()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimCalculatedSummaryCase::RifCalculatedSummaryCurveReader::RifCalculatedSummaryCurveReader(RimCalculationCollection* calculationCollection)
RimCalculatedSummaryCase::RifCalculatedSummaryCurveReader::RifCalculatedSummaryCurveReader(RimSummaryCalculationCollection* calculationCollection)
: m_calculationCollection(calculationCollection)
{
ApplicationCode/ProjectDataModel/Summary/RimCalculatedSummaryCase.h
+3 -3
View File
@@ -21,7 +21,7 @@
#include "RimSummaryCase.h"
#include "RifSummaryReaderInterface.h"
class RimCalculationCollection;
class RimSummaryCalculationCollection;
class RimSummaryCalculation;
@@ -39,7 +39,7 @@ private:
class RifCalculatedSummaryCurveReader : public RifSummaryReaderInterface
{
public:
explicit RifCalculatedSummaryCurveReader(RimCalculationCollection* calculationCollection);
explicit RifCalculatedSummaryCurveReader(RimSummaryCalculationCollection* calculationCollection);
virtual const std::vector<time_t>& timeSteps(const RifEclipseSummaryAddress& resultAddress) const override;
virtual bool values(const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values) const override;
@@ -51,7 +51,7 @@ private:
RimSummaryCalculation* findCalculationByName(const RifEclipseSummaryAddress& resultAddress) const;
private:
caf::PdmPointer<RimCalculationCollection> m_calculationCollection;
caf::PdmPointer<RimSummaryCalculationCollection> m_calculationCollection;
};
public:
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp
+1 -1
View File
@@ -23,7 +23,7 @@
#include "RifReaderEclipseSummary.h"
#include "RimCalculationCollection.h"
#include "RimSummaryCalculationCollection.h"
#include "RimEclipseResultCase.h"
#include "RimProject.h"
#include "RimSummaryCase.h"