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

Rename RimSummaryCaseCollection to RimSummaryEnsemble.

Browse Source
This commit is contained in:
Kristian Bendiksen
2024-07-29 15:38:17 +02:00
parent 1d7b40fbdd
commit e9c46c5cec
147 changed files with 852 additions and 862 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationLibCode/FileInterface/RifDataSourceForRftPlt.cpp
View File

@@ -25,7 +25,7 @@
#include "RimObservedFmuRftData.h"
#include "RimPressureDepthData.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryEnsemble.h"
#include "RimWellLogLasFile.h"
#include "cafAppEnum.h"
@@ -83,7 +83,7 @@ RifDataSourceForRftPlt::RifDataSourceForRftPlt( RimWellLogLasFile* wellLogFile )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifDataSourceForRftPlt::RifDataSourceForRftPlt( RimSummaryCaseCollection* ensemble )
RifDataSourceForRftPlt::RifDataSourceForRftPlt( RimSummaryEnsemble* ensemble )
{
m_sourceType = SourceType::ENSEMBLE_RFT;
m_ensemble = ensemble;
@@ -92,7 +92,7 @@ RifDataSourceForRftPlt::RifDataSourceForRftPlt( RimSummaryCaseCollection* ensemb
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifDataSourceForRftPlt::RifDataSourceForRftPlt( RimSummaryCase* summaryCase, RimSummaryCaseCollection* ensemble, RimEclipseCase* eclipseCase )
RifDataSourceForRftPlt::RifDataSourceForRftPlt( RimSummaryCase* summaryCase, RimSummaryEnsemble* ensemble, RimEclipseCase* eclipseCase )
{
m_sourceType = SourceType::SUMMARY_RFT;
m_summaryCase = summaryCase;
@@ -232,7 +232,7 @@ auto RifDataSourceForRftPlt::operator<=>( const RifDataSourceForRftPlt& addr2 )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryCaseCollection* RifDataSourceForRftPlt::ensemble() const
RimSummaryEnsemble* RifDataSourceForRftPlt::ensemble() const
{
return m_ensemble;
}

30
ApplicationLibCode/FileInterface/RifDataSourceForRftPlt.h
View File

@@ -32,7 +32,7 @@
class RimWellLogLasFile;
class RimEclipseCase;
class RimSummaryCase;
class RimSummaryCaseCollection;
class RimSummaryEnsemble;
class RimObservedFmuRftData;
class RimPressureDepthData;
@@ -57,20 +57,20 @@ public:
RifDataSourceForRftPlt();
RifDataSourceForRftPlt( SourceType sourceType, RimEclipseCase* eclCase );
RifDataSourceForRftPlt( RimSummaryCaseCollection* ensemble );
RifDataSourceForRftPlt( RimSummaryCase* summaryCase, RimSummaryCaseCollection* ensemble, RimEclipseCase* eclipseCase );
RifDataSourceForRftPlt( RimSummaryEnsemble* ensemble );
RifDataSourceForRftPlt( RimSummaryCase* summaryCase, RimSummaryEnsemble* ensemble, RimEclipseCase* eclipseCase );
RifDataSourceForRftPlt( RimWellLogLasFile* wellLogFile );
RifDataSourceForRftPlt( RimObservedFmuRftData* observedFmuRftData );
RifDataSourceForRftPlt( RimPressureDepthData* pressureDepthData );
SourceType sourceType() const;
RimEclipseCase* eclCase() const;
RimSummaryCase* summaryCase() const;
RimSummaryCaseCollection* ensemble() const;
RimWellLogLasFile* wellLogFile() const;
RimObservedFmuRftData* observedFmuRftData() const;
RimPressureDepthData* pressureDepthData() const;
RimEclipseCase* eclCase() const;
RimSummaryCase* summaryCase() const;
RimSummaryEnsemble* ensemble() const;
RimWellLogLasFile* wellLogFile() const;
RimObservedFmuRftData* observedFmuRftData() const;
RimPressureDepthData* pressureDepthData() const;
static QString sourceTypeUiText( SourceType sourceType );
@@ -85,12 +85,12 @@ public:
private:
SourceType m_sourceType;
caf::PdmPointer<RimEclipseCase> m_eclCase;
caf::PdmPointer<RimSummaryCase> m_summaryCase;
caf::PdmPointer<RimSummaryCaseCollection> m_ensemble;
caf::PdmPointer<RimWellLogLasFile> m_wellLogFile;
caf::PdmPointer<RimObservedFmuRftData> m_observedFmuRftData;
caf::PdmPointer<RimPressureDepthData> m_pressureDepthData;
caf::PdmPointer<RimEclipseCase> m_eclCase;
caf::PdmPointer<RimSummaryCase> m_summaryCase;
caf::PdmPointer<RimSummaryEnsemble> m_ensemble;
caf::PdmPointer<RimWellLogLasFile> m_wellLogFile;
caf::PdmPointer<RimObservedFmuRftData> m_observedFmuRftData;
caf::PdmPointer<RimPressureDepthData> m_pressureDepthData;
};
QTextStream& operator<<( QTextStream& str, const RifDataSourceForRftPlt& addr );

5
ApplicationLibCode/FileInterface/RifReaderEnsembleStatisticsRft.cpp
View File

@@ -25,7 +25,7 @@
#include "RigWellPath.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryEnsemble.h"
#include "RimTools.h"
#include "cafAssert.h"
@@ -33,8 +33,7 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifReaderEnsembleStatisticsRft::RifReaderEnsembleStatisticsRft( const RimSummaryCaseCollection* summaryCaseCollection,
RimEclipseCase* eclipseCase )
RifReaderEnsembleStatisticsRft::RifReaderEnsembleStatisticsRft( const RimSummaryEnsemble* summaryCaseCollection, RimEclipseCase* eclipseCase )
: m_summaryCaseCollection( summaryCaseCollection )
, m_eclipseCase( eclipseCase )
{

8
ApplicationLibCode/FileInterface/RifReaderEnsembleStatisticsRft.h
View File

@@ -25,14 +25,14 @@
#include "cvfObject.h"
class RimSummaryCaseCollection;
class RimSummaryEnsemble;
class RimEclipseCase;
class RigWellPath;
class RifReaderEnsembleStatisticsRft : public RifReaderRftInterface
{
public:
RifReaderEnsembleStatisticsRft( const RimSummaryCaseCollection* summaryCaseCollection, RimEclipseCase* eclipseCase );
RifReaderEnsembleStatisticsRft( const RimSummaryEnsemble* summaryCaseCollection, RimEclipseCase* eclipseCase );
std::set<RifEclipseRftAddress> eclipseRftAddresses() override;
void values( const RifEclipseRftAddress& rftAddress, std::vector<double>* values ) override;
@@ -58,8 +58,8 @@ private:
void clearCache( const QString& wellName, const QDateTime& timeStep );
private:
const RimSummaryCaseCollection* m_summaryCaseCollection;
RimEclipseCase* m_eclipseCase;
const RimSummaryEnsemble* m_summaryCaseCollection;
RimEclipseCase* m_eclipseCase;
std::map<RifEclipseRftAddress, std::vector<double>> m_cachedValues;
};