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

12
ApplicationLibCode/ProjectDataModel/RimProject.cpp
View File

@@ -84,8 +84,8 @@
#include "RimStimPlanModelPlotCollection.h"
#include "RimSummaryCalculation.h"
#include "RimSummaryCalculationCollection.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryCaseMainCollection.h"
#include "RimSummaryEnsemble.h"
#include "RimSummaryMultiPlotCollection.h"
#include "RimSummaryTableCollection.h"
#include "RimSurfaceCollection.h"
@@ -538,11 +538,11 @@ void RimProject::assignCaseIdToSummaryCase( RimSummaryCase* summaryCase )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimProject::assignIdToEnsemble( RimSummaryCaseCollection* summaryCaseCollection )
void RimProject::assignIdToEnsemble( RimSummaryEnsemble* summaryCaseCollection )
{
if ( summaryCaseCollection )
{
for ( RimSummaryCaseCollection* s : RimProject::summaryGroups() )
for ( RimSummaryEnsemble* s : RimProject::summaryGroups() )
{
m_nextValidEnsembleId = std::max( m_nextValidEnsembleId, s->ensembleId() + 1 );
}
@@ -715,9 +715,9 @@ std::vector<RimSummaryCase*> RimProject::allSummaryCases() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimSummaryCaseCollection*> RimProject::summaryGroups() const
std::vector<RimSummaryEnsemble*> RimProject::summaryGroups() const
{
std::vector<RimSummaryCaseCollection*> groups;
std::vector<RimSummaryEnsemble*> groups;
for ( RimOilField* oilField : oilFields )
{
@@ -725,7 +725,7 @@ std::vector<RimSummaryCaseCollection*> RimProject::summaryGroups() const
RimSummaryCaseMainCollection* sumCaseMainColl = oilField->summaryCaseMainCollection();
if ( sumCaseMainColl )
{
std::vector<RimSummaryCaseCollection*> g = sumCaseMainColl->summaryCaseCollections();
std::vector<RimSummaryEnsemble*> g = sumCaseMainColl->summaryCaseCollections();
groups.insert( groups.end(), g.begin(), g.end() );
}
}