Rename RimSummaryCaseCollection to RimSummaryEnsemble.

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

View File

@@ -21,7 +21,7 @@
#include "RimObservedFmuRftData.h"
#include "RimPressureDepthData.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryEnsemble.h"
#include "RimWellLogLasFile.h"
#include "cafAppEnum.h"

View File

@@ -34,7 +34,7 @@
#include <QPointer>
class RimObservedFmuRftData;
class RimSummaryCaseCollection;
class RimSummaryEnsemble;
class RimWellLogLasFile;
class RimEclipseCase;
@@ -59,10 +59,10 @@ private:
private:
caf::PdmField<caf::AppEnum<RifDataSourceForRftPlt::SourceType>> m_sourceType;
caf::PdmPtrField<RimEclipseCase*> m_eclCase;
caf::PdmPtrField<RimSummaryCase*> m_summaryCase;
caf::PdmPtrField<RimSummaryCaseCollection*> m_ensemble;
caf::PdmPtrField<RimWellLogLasFile*> m_wellLogFile;
caf::PdmPtrField<RimObservedFmuRftData*> m_observedFmuRftData;
caf::PdmPtrField<RimPressureDepthData*> m_pressureDepthData;
caf::PdmPtrField<RimEclipseCase*> m_eclCase;
caf::PdmPtrField<RimSummaryCase*> m_summaryCase;
caf::PdmPtrField<RimSummaryEnsemble*> m_ensemble;
caf::PdmPtrField<RimWellLogLasFile*> m_wellLogFile;
caf::PdmPtrField<RimObservedFmuRftData*> m_observedFmuRftData;
caf::PdmPtrField<RimPressureDepthData*> m_pressureDepthData;
};

View File

@@ -33,7 +33,7 @@
#include "RimPressureDepthData.h"
#include "RimProject.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryEnsemble.h"
#include "RimSummaryEnsembleTools.h"
#include "RimWellLogChannel.h"
#include "RimWellLogExtractionCurve.h"
@@ -449,15 +449,15 @@ std::set<QDateTime> rftTimeStepsForWell( const std::vector<RimSummaryCase*>& sum
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimSummaryCaseCollection*> rftEnsemblesForWell( const QString& simWellName )
std::vector<RimSummaryEnsemble*> rftEnsemblesForWell( const QString& simWellName )
{
const RimProject* project = RimProject::current();
std::vector<RimSummaryCaseCollection*> allSummaryCaseCollections = project->summaryGroups();
std::vector<RimSummaryEnsemble*> allSummaryCaseCollections = project->summaryGroups();
std::vector<RimSummaryCaseCollection*> rftEnsembles;
std::vector<RimSummaryEnsemble*> rftEnsembles;
for ( RimSummaryCaseCollection* summaryCaseColl : allSummaryCaseCollections )
for ( RimSummaryEnsemble* summaryCaseColl : allSummaryCaseCollections )
{
if ( summaryCaseColl && summaryCaseColl->isEnsemble() &&
!rftTimeStepsForWell( summaryCaseColl->allSummaryCases(), simWellName ).empty() )
@@ -471,15 +471,15 @@ std::vector<RimSummaryCaseCollection*> rftEnsemblesForWell( const QString& simWe
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimSummaryCaseCollection*> rftEnsembles()
std::vector<RimSummaryEnsemble*> rftEnsembles()
{
const RimProject* project = RimProject::current();
std::vector<RimSummaryCaseCollection*> allSummaryCaseCollections = project->summaryGroups();
std::vector<RimSummaryEnsemble*> allSummaryCaseCollections = project->summaryGroups();
std::vector<RimSummaryCaseCollection*> rftEnsembles;
std::vector<RimSummaryEnsemble*> rftEnsembles;
for ( RimSummaryCaseCollection* summaryCaseColl : allSummaryCaseCollections )
for ( RimSummaryEnsemble* summaryCaseColl : allSummaryCaseCollections )
{
if ( summaryCaseColl && summaryCaseColl->isEnsemble() &&
!RimSummaryEnsembleTools::wellsWithRftData( summaryCaseColl->allSummaryCases() ).empty() )
@@ -663,11 +663,11 @@ RiaRftPltCurveDefinition curveDefFromCurve( const RimWellLogCurve* curve )
if ( rftCurve != nullptr )
{
RimEclipseResultCase* rftCase = dynamic_cast<RimEclipseResultCase*>( rftCurve->eclipseCase() );
RimSummaryCase* rftSummaryCase = rftCurve->summaryCase();
RimSummaryCaseCollection* rftEnsemble = rftCurve->ensemble();
RimObservedFmuRftData* rftFmuData = rftCurve->observedFmuRftData();
RimPressureDepthData* pressureDepthData = rftCurve->pressureDepthData();
RimEclipseResultCase* rftCase = dynamic_cast<RimEclipseResultCase*>( rftCurve->eclipseCase() );
RimSummaryCase* rftSummaryCase = rftCurve->summaryCase();
RimSummaryEnsemble* rftEnsemble = rftCurve->ensemble();
RimObservedFmuRftData* rftFmuData = rftCurve->observedFmuRftData();
RimPressureDepthData* pressureDepthData = rftCurve->pressureDepthData();
const RifEclipseRftAddress rftAddress = rftCurve->rftAddress();
const QString& wellName = rftAddress.wellName();
@@ -678,7 +678,7 @@ RiaRftPltCurveDefinition curveDefFromCurve( const RimWellLogCurve* curve )
// Presens of rftSummaryCase must be tested before rftCase because a rftSummaryCase can have a rftCase
// The rftCase is used to extract TVD/MD from the grid model
RimSummaryCaseCollection* parentEnsemble = rftSummaryCase->firstAncestorOrThisOfType<RimSummaryCaseCollection>();
RimSummaryEnsemble* parentEnsemble = rftSummaryCase->firstAncestorOrThisOfType<RimSummaryEnsemble>();
return RiaRftPltCurveDefinition( RifDataSourceForRftPlt( rftSummaryCase, parentEnsemble, rftCase ), wellName, timeStep );
}
else if ( rftCase != nullptr )

View File

@@ -31,7 +31,7 @@
class RimEclipseCase;
class RimEclipseResultCase;
class RimObservedFmuRftData;
class RimSummaryCaseCollection;
class RimSummaryEnsemble;
class RimWellLogCurve;
class RimWellLogChannel;
class RimWellLogPlot;
@@ -80,13 +80,13 @@ RiaRftPltCurveDefinition curveDefFromCurve( const R
bool hasFlowData( const RimWellLog* wellLog );
bool hasAssociatedWellPath( const QString& wellName );
std::vector<RimEclipseResultCase*> gridCasesForWell( const QString& simWellName );
std::vector<RimEclipseResultCase*> rftCasesForWell( const QString& simWellName );
std::vector<RimSummaryCaseCollection*> rftEnsemblesForWell( const QString& simWellName );
std::vector<RimSummaryCaseCollection*> rftEnsembles();
std::vector<RimObservedFmuRftData*> observedFmuRftDataForWell( const QString& simWellName );
std::vector<RimObservedFmuRftData*> observedFmuRftData();
QString simWellName( const QString& wellPathNameOrSimWellName );
std::vector<RimEclipseResultCase*> gridCasesForWell( const QString& simWellName );
std::vector<RimEclipseResultCase*> rftCasesForWell( const QString& simWellName );
std::vector<RimSummaryEnsemble*> rftEnsemblesForWell( const QString& simWellName );
std::vector<RimSummaryEnsemble*> rftEnsembles();
std::vector<RimObservedFmuRftData*> observedFmuRftDataForWell( const QString& simWellName );
std::vector<RimObservedFmuRftData*> observedFmuRftData();
QString simWellName( const QString& wellPathNameOrSimWellName );
std::map<QDateTime, std::set<RifDataSourceForRftPlt>>
calculateRelevantTimeStepsFromCases( const QString& wellPathNameOrSimWellName,

View File

@@ -24,7 +24,7 @@
#include "RimEnsembleCurveSetColorManager.h"
#include "RimRegularLegendConfig.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryEnsemble.h"
#include "RimTools.h"
#include "RimWellRftPlot.h"
@@ -77,7 +77,7 @@ RimWellRftEnsembleCurveSet::~RimWellRftEnsembleCurveSet()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryCaseCollection* RimWellRftEnsembleCurveSet::ensemble() const
RimSummaryEnsemble* RimWellRftEnsembleCurveSet::ensemble() const
{
return m_ensemble;
}
@@ -85,7 +85,7 @@ RimSummaryCaseCollection* RimWellRftEnsembleCurveSet::ensemble() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellRftEnsembleCurveSet::setEnsemble( RimSummaryCaseCollection* ensemble )
void RimWellRftEnsembleCurveSet::setEnsemble( RimSummaryEnsemble* ensemble )
{
m_ensemble = ensemble;
@@ -148,8 +148,8 @@ void RimWellRftEnsembleCurveSet::setEnsembleParameter( const QString& parameterN
//--------------------------------------------------------------------------------------------------
std::vector<QString> RimWellRftEnsembleCurveSet::parametersWithVariation() const
{
std::set<QString> paramSet;
RimSummaryCaseCollection* group = m_ensemble;
std::set<QString> paramSet;
RimSummaryEnsemble* group = m_ensemble;
if ( group )
{
auto parameters = group->variationSortedEnsembleParameters( true );
@@ -192,8 +192,8 @@ RigEnsembleParameter::Type RimWellRftEnsembleCurveSet::currentEnsembleParameterT
{
if ( m_ensembleColorMode() == ColorMode::BY_ENSEMBLE_PARAM )
{
RimSummaryCaseCollection* group = m_ensemble();
QString parameterName = m_ensembleParameter();
RimSummaryEnsemble* group = m_ensemble();
QString parameterName = m_ensembleParameter();
if ( group && !parameterName.isEmpty() )
{

View File

@@ -31,7 +31,7 @@
#include <QPointer>
class RiuCvfOverlayItemWidget;
class RimSummaryCaseCollection;
class RimSummaryEnsemble;
class RimEclipseCase;
class RifReaderEnsembleStatisticsRft;
class RifReaderRftInterface;
@@ -48,13 +48,13 @@ public:
RimWellRftEnsembleCurveSet();
~RimWellRftEnsembleCurveSet() override;
RimSummaryCaseCollection* ensemble() const;
void setEnsemble( RimSummaryCaseCollection* ensemble );
ColorMode colorMode() const;
void setColorMode( ColorMode mode );
void initializeLegend();
cvf::Color3f caseColor( const RimSummaryCase* summaryCase ) const;
QString currentEnsembleParameter() const;
RimSummaryEnsemble* ensemble() const;
void setEnsemble( RimSummaryEnsemble* ensemble );
ColorMode colorMode() const;
void setColorMode( ColorMode mode );
void initializeLegend();
cvf::Color3f caseColor( const RimSummaryCase* summaryCase ) const;
QString currentEnsembleParameter() const;
void setEnsembleParameter( const QString& parameterName );
RimRegularLegendConfig* legendConfig();
@@ -81,7 +81,7 @@ private:
private:
caf::PdmPtrField<RimEclipseCase*> m_eclipseCase;
caf::PdmPtrField<RimSummaryCaseCollection*> m_ensemble;
caf::PdmPtrField<RimSummaryEnsemble*> m_ensemble;
caf::PdmProxyValueField<QString> m_ensembleName;
caf::PdmField<ColorModeEnum> m_ensembleColorMode;
caf::PdmField<QString> m_ensembleParameter;

View File

@@ -38,7 +38,7 @@
#include "RimRegularLegendConfig.h"
#include "RimReloadCaseTools.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryEnsemble.h"
#include "RimSummaryEnsembleTools.h"
#include "RimTools.h"
#include "RimWellLogChannel.h"
@@ -233,7 +233,7 @@ QString RimWellRftPlot::associatedSimWellName() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellRftPlot::applyInitialSelections( std::variant<RimSummaryCase*, RimSummaryCaseCollection*> dataSource )
void RimWellRftPlot::applyInitialSelections( std::variant<RimSummaryCase*, RimSummaryEnsemble*> dataSource )
{
std::map<QString, QStringList> wellSources = findWellSources();
if ( m_wellPathNameOrSimWellName() == "None" && !wellSources.empty() )
@@ -241,10 +241,10 @@ void RimWellRftPlot::applyInitialSelections( std::variant<RimSummaryCase*, RimSu
m_wellPathNameOrSimWellName = wellSources.begin()->first;
}
RimSummaryCaseCollection* ensemble = nullptr;
RimSummaryCase* summaryCase = nullptr;
RimSummaryEnsemble* ensemble = nullptr;
RimSummaryCase* summaryCase = nullptr;
if ( auto summaryCollection = std::get_if<RimSummaryCaseCollection*>( &dataSource ) )
if ( auto summaryCollection = std::get_if<RimSummaryEnsemble*>( &dataSource ) )
{
ensemble = *summaryCollection;
}
@@ -270,7 +270,7 @@ void RimWellRftPlot::applyInitialSelections( std::variant<RimSummaryCase*, RimSu
sourcesToSelect.push_back( RifDataSourceForRftPlt( RifDataSourceForRftPlt::SourceType::GRID_MODEL_CELL_DATA, gridCase ) );
}
for ( RimSummaryCaseCollection* const ensemble : RimWellPlotTools::rftEnsemblesForWell( simWellName ) )
for ( RimSummaryEnsemble* const ensemble : RimWellPlotTools::rftEnsemblesForWell( simWellName ) )
{
sourcesToSelect.push_back( RifDataSourceForRftPlt( ensemble ) );
}
@@ -509,7 +509,7 @@ void RimWellRftPlot::updateCurvesInPlot( const std::set<RiaRftPltCurveDefinition
defineCurveColorsAndSymbols( allCurveDefs );
std::set<RimSummaryCaseCollection*> ensemblesWithSummaryCurves;
std::set<RimSummaryEnsemble*> ensemblesWithSummaryCurves;
// Add new curves
for ( const RiaRftPltCurveDefinition& curveDefToAdd : allCurveDefs )
@@ -595,8 +595,8 @@ void RimWellRftPlot::updateCurvesInPlot( const std::set<RiaRftPltCurveDefinition
}
else if ( m_showStatisticsCurves && curveDefToAdd.address().sourceType() == RifDataSourceForRftPlt::SourceType::ENSEMBLE_RFT )
{
RimSummaryCaseCollection* ensemble = curveDefToAdd.address().ensemble();
auto curveSet = findEnsembleCurveSet( ensemble );
RimSummaryEnsemble* ensemble = curveDefToAdd.address().ensemble();
auto curveSet = findEnsembleCurveSet( ensemble );
std::set<RifEclipseRftAddress> rftAddresses =
curveSet->statisticsEclipseRftReader()->eclipseRftAddresses( m_wellPathNameOrSimWellName, curveDefToAdd.timeStep() );
@@ -867,14 +867,14 @@ QList<caf::PdmOptionItemInfo> RimWellRftPlot::calculateValueOptionsForSources()
}
}
const std::vector<RimSummaryCaseCollection*> rftEnsembles = RimWellPlotTools::rftEnsemblesForWell( m_wellPathNameOrSimWellName );
const std::vector<RimSummaryEnsemble*> rftEnsembles = RimWellPlotTools::rftEnsemblesForWell( m_wellPathNameOrSimWellName );
if ( !rftEnsembles.empty() )
{
options.push_back(
caf::PdmOptionItemInfo::createHeader( RifDataSourceForRftPlt::sourceTypeUiText( RifDataSourceForRftPlt::SourceType::ENSEMBLE_RFT ),
true ) );
for ( RimSummaryCaseCollection* rftEnsemble : rftEnsembles )
for ( RimSummaryEnsemble* rftEnsemble : rftEnsembles )
{
auto addr = RifDataSourceForRftPlt( rftEnsemble );
auto item = caf::PdmOptionItemInfo( rftEnsemble->name(), QVariant::fromValue( addr ) );
@@ -894,7 +894,7 @@ QList<caf::PdmOptionItemInfo> RimWellRftPlot::calculateValueOptionsForSources()
if ( summaryCase->rftReader() && summaryCase->rftReader()->wellNames().contains( m_wellPathNameOrSimWellName ) )
{
auto eclipeGridModel = RimReloadCaseTools::gridModelFromSummaryCase( summaryCase );
auto parentEnsemble = summaryCase->firstAncestorOrThisOfType<RimSummaryCaseCollection>();
auto parentEnsemble = summaryCase->firstAncestorOrThisOfType<RimSummaryEnsemble>();
auto addr = RifDataSourceForRftPlt( summaryCase, parentEnsemble, eclipeGridModel );
auto item = caf::PdmOptionItemInfo( summaryCase->displayCaseName(), QVariant::fromValue( addr ) );
@@ -1036,7 +1036,7 @@ void RimWellRftPlot::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrderin
for ( RimWellRftEnsembleCurveSet* curveSet : m_ensembleCurveSets() )
{
bool isSelected = false;
for ( RimSummaryCaseCollection* selectedCurveSet : selectedEnsembles() )
for ( RimSummaryEnsemble* selectedCurveSet : selectedEnsembles() )
{
if ( curveSet->ensemble() == selectedCurveSet )
{
@@ -1149,10 +1149,10 @@ std::map<QString, QStringList> RimWellRftPlot::findWellSources()
}
}
const std::vector<RimSummaryCaseCollection*> rftEnsembles = RimWellPlotTools::rftEnsembles();
const std::vector<RimSummaryEnsemble*> rftEnsembles = RimWellPlotTools::rftEnsembles();
// Ensemble RFT wells
{
for ( RimSummaryCaseCollection* summaryCaseColl : rftEnsembles )
for ( RimSummaryEnsemble* summaryCaseColl : rftEnsembles )
{
std::set<QString> wellsWithRftData = RimSummaryEnsembleTools::wellsWithRftData( summaryCaseColl->allSummaryCases() );
for ( const QString& wellName : wellsWithRftData )
@@ -1412,7 +1412,7 @@ void RimWellRftPlot::defineCurveColorsAndSymbols( const std::set<RiaRftPltCurveD
CAF_ASSERT( curveSet );
auto ensemble_it = std::find_if( ensembles.begin(),
ensembles.end(),
[&curveSet]( const RimSummaryCaseCollection* ensemble ) { return curveSet->ensemble() == ensemble; } );
[&curveSet]( const RimSummaryEnsemble* ensemble ) { return curveSet->ensemble() == ensemble; } );
if ( ensemble_it != ensembles.end() )
{
curveSet->initializeLegend();
@@ -1475,9 +1475,9 @@ void RimWellRftPlot::defineCurveColorsAndSymbols( const std::set<RiaRftPltCurveD
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimSummaryCaseCollection*> RimWellRftPlot::selectedEnsembles() const
std::vector<RimSummaryEnsemble*> RimWellRftPlot::selectedEnsembles() const
{
std::vector<RimSummaryCaseCollection*> ensembleSets;
std::vector<RimSummaryEnsemble*> ensembleSets;
for ( const RifDataSourceForRftPlt& dataSource : m_selectedSources() )
{
if ( dataSource.ensemble() != nullptr )
@@ -1493,7 +1493,7 @@ std::vector<RimSummaryCaseCollection*> RimWellRftPlot::selectedEnsembles() const
//--------------------------------------------------------------------------------------------------
void RimWellRftPlot::createEnsembleCurveSets()
{
const std::vector<RimSummaryCaseCollection*> rftEnsembles = RimWellPlotTools::rftEnsemblesForWell( m_wellPathNameOrSimWellName );
const std::vector<RimSummaryEnsemble*> rftEnsembles = RimWellPlotTools::rftEnsemblesForWell( m_wellPathNameOrSimWellName );
// First delete any curve sets not belonging to the given rftEnsembles
std::vector<RimWellRftEnsembleCurveSet*> curveSetsToDelete;
@@ -1512,7 +1512,7 @@ void RimWellRftPlot::createEnsembleCurveSets()
}
// Then add curve set for any ensembles we haven't already added
for ( RimSummaryCaseCollection* ensemble : rftEnsembles )
for ( RimSummaryEnsemble* ensemble : rftEnsembles )
{
auto it = std::find_if( m_ensembleCurveSets.begin(),
m_ensembleCurveSets.end(),
@@ -1529,7 +1529,7 @@ void RimWellRftPlot::createEnsembleCurveSets()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimWellRftEnsembleCurveSet* RimWellRftPlot::findEnsembleCurveSet( RimSummaryCaseCollection* ensemble ) const
RimWellRftEnsembleCurveSet* RimWellRftPlot::findEnsembleCurveSet( RimSummaryEnsemble* ensemble ) const
{
for ( RimWellRftEnsembleCurveSet* curveSet : m_ensembleCurveSets() )
{
@@ -1544,7 +1544,7 @@ RimWellRftEnsembleCurveSet* RimWellRftPlot::findEnsembleCurveSet( RimSummaryCase
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::variant<RimSummaryCase*, RimSummaryCaseCollection*> RimWellRftPlot::dataSource() const
std::variant<RimSummaryCase*, RimSummaryEnsemble*> RimWellRftPlot::dataSource() const
{
// Return the first selected ensemble, if any
// If no ensemble is selected, return the first selected summary case, if any

View File

@@ -84,8 +84,8 @@ public:
int branchIndex() const;
std::variant<RimSummaryCase*, RimSummaryCaseCollection*> dataSource() const;
void applyInitialSelections( std::variant<RimSummaryCase*, RimSummaryCaseCollection*> dataSource );
std::variant<RimSummaryCase*, RimSummaryEnsemble*> dataSource() const;
void applyInitialSelections( std::variant<RimSummaryCase*, RimSummaryEnsemble*> dataSource );
static const char* plotNameFormatString();
@@ -94,7 +94,7 @@ public:
bool showErrorBarsForObservedData() const;
void onLegendDefinitionChanged();
RimWellRftEnsembleCurveSet* findEnsembleCurveSet( RimSummaryCaseCollection* ensemble ) const;
RimWellRftEnsembleCurveSet* findEnsembleCurveSet( RimSummaryEnsemble* ensemble ) const;
protected:
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
@@ -140,8 +140,8 @@ private:
cvf::Color3f findCurveColor( RimWellLogCurve* curve );
void defineCurveColorsAndSymbols( const std::set<RiaRftPltCurveDefinition>& allCurveDefs );
std::vector<RimSummaryCaseCollection*> selectedEnsembles() const;
void createEnsembleCurveSets();
std::vector<RimSummaryEnsemble*> selectedEnsembles() const;
void createEnsembleCurveSets();
private:
friend class RimWellRftEnsembleCurveSet;