OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-31 09:14:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

Rename RimSummaryCaseCollection to RimSummaryEnsemble.

Browse Source
This commit is contained in:
Kristian Bendiksen committed 2024-07-30 08:55:12 +02:00
1 parent 1d7b40fbdd
commit e9c46c5cec
147 files changed
+852 -862
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/ProjectDataModel/Flow/RimWellRftPlot.cpp
+22 -22
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