mirror of
https://github.com/OPM/ResInsight.git
synced 2026-10-30 00:50:15 -05:00
#13019 Remove assert from RiaSummaryTools::summaryCaseMainCollection()
This commit is contained in:
1 parent
17a0991bc5
commit
6cef55b897
12 files changed
+67
-61
No files matched your search
@@ -83,19 +83,22 @@ std::vector<RimSummarySumoDataSource*> RimCloudDataSourceCollection::sumoDataSou
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimCloudDataSourceCollection::createEnsemblesFromSelectedDataSources( const std::vector<RimSummarySumoDataSource*>& dataSources )
|
||||
{
|
||||
auto sumCaseMainColl = RiaSummaryTools::summaryCaseMainCollection();
|
||||
if ( !sumCaseMainColl ) return;
|
||||
|
||||
for ( auto dataSource : dataSources )
|
||||
{
|
||||
RimSummaryEnsembleSumo* ensemble = new RimSummaryEnsembleSumo();
|
||||
ensemble->setUsePathKey1( true );
|
||||
ensemble->setSumoDataSource( dataSource );
|
||||
RiaSummaryTools::summaryCaseMainCollection()->addEnsemble( ensemble );
|
||||
sumCaseMainColl->addEnsemble( ensemble );
|
||||
ensemble->loadDataAndUpdate();
|
||||
|
||||
RiaSummaryPlotTools::createAndAppendDefaultSummaryMultiPlot( {}, { ensemble } );
|
||||
}
|
||||
|
||||
RiaSummaryTools::updateSummaryEnsembleNames();
|
||||
RiaSummaryTools::summaryCaseMainCollection()->updateAllRequiredEditors();
|
||||
sumCaseMainColl->updateAllRequiredEditors();
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
||||
@@ -36,18 +36,21 @@ namespace RimEnsembleFileSetTools
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
std::vector<RimSummaryEnsemble*> createSummaryEnsemblesFromFileSets( const std::vector<RimEnsembleFileSet*> fileSets )
|
||||
{
|
||||
auto sumCaseMainColl = RiaSummaryTools::summaryCaseMainCollection();
|
||||
if ( !sumCaseMainColl ) return {};
|
||||
|
||||
std::vector<RimSummaryEnsemble*> ensembles;
|
||||
for ( auto fileSet : fileSets )
|
||||
{
|
||||
auto ensemble = new RimSummaryFileSetEnsemble();
|
||||
ensemble->setEnsembleFileSet( fileSet );
|
||||
RiaSummaryTools::summaryCaseMainCollection()->addEnsemble( ensemble );
|
||||
RiaSummaryTools::summaryCaseMainCollection()->updateEnsembleNames();
|
||||
sumCaseMainColl->addEnsemble( ensemble );
|
||||
sumCaseMainColl->updateEnsembleNames();
|
||||
ensemble->loadDataAndUpdate();
|
||||
ensembles.push_back( ensemble );
|
||||
}
|
||||
|
||||
RiaSummaryTools::summaryCaseMainCollection()->updateAllRequiredEditors();
|
||||
sumCaseMainColl->updateAllRequiredEditors();
|
||||
|
||||
return ensembles;
|
||||
}
|
||||
|
||||
@@ -810,15 +810,6 @@ std::vector<RimSummaryEnsemble*> RimProject::summaryEnsembles() const
|
||||
return ensembles;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RimSummaryCaseMainCollection* RimProject::firstSummaryCaseMainCollection() const
|
||||
{
|
||||
if ( oilFields.empty() ) return nullptr;
|
||||
return oilFields[0]->summaryCaseMainCollection;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
||||
@@ -134,7 +134,6 @@ public:
|
||||
|
||||
std::vector<RimSummaryCase*> allSummaryCases() const;
|
||||
std::vector<RimSummaryEnsemble*> summaryEnsembles() const;
|
||||
RimSummaryCaseMainCollection* firstSummaryCaseMainCollection() const;
|
||||
|
||||
[[nodiscard]] std::vector<Rim3dView*> allViews() const;
|
||||
[[nodiscard]] std::vector<Rim3dView*> allVisibleViews() const;
|
||||
|
||||
@@ -187,9 +187,10 @@ RimEclipseCase* RimReloadCaseTools::gridModelFromSummaryCase( const RimSummaryCa
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RimSummaryCase* RimReloadCaseTools::findSummaryCaseFromEclipseResultCase( const RimEclipseResultCase* eclipseResultCase )
|
||||
{
|
||||
RiaEclipseFileNameTools helper( eclipseResultCase->gridFileName() );
|
||||
|
||||
RimSummaryCaseMainCollection* sumCaseColl = RiaSummaryTools::summaryCaseMainCollection();
|
||||
if ( !sumCaseColl ) return nullptr;
|
||||
|
||||
RiaEclipseFileNameTools helper( eclipseResultCase->gridFileName() );
|
||||
|
||||
auto summaryFileNames = helper.findSummaryFileCandidates();
|
||||
for ( const auto& fileName : summaryFileNames )
|
||||
|
||||
@@ -54,19 +54,21 @@ void RimSummaryCalculationCollection::updateDataDependingOnCalculations()
|
||||
|
||||
// Refresh data sources tree
|
||||
// Refresh meta data for all summary cases and rebuild AddressNodes in the summary tree
|
||||
RimSummaryCaseMainCollection* summaryCaseCollection = RiaSummaryTools::summaryCaseMainCollection();
|
||||
auto summaryCases = summaryCaseCollection->allSummaryCases();
|
||||
for ( RimSummaryCase* summaryCase : summaryCases )
|
||||
if ( auto summaryCaseCollection = RiaSummaryTools::summaryCaseMainCollection() )
|
||||
{
|
||||
if ( !summaryCase ) continue;
|
||||
|
||||
if ( summaryCase->showVectorItemsInProjectTree() )
|
||||
auto summaryCases = summaryCaseCollection->allSummaryCases();
|
||||
for ( RimSummaryCase* summaryCase : summaryCases )
|
||||
{
|
||||
if ( auto reader = summaryCase->summaryReader() )
|
||||
if ( !summaryCase ) continue;
|
||||
|
||||
if ( summaryCase->showVectorItemsInProjectTree() )
|
||||
{
|
||||
reader->createAndSetAddresses();
|
||||
if ( auto reader = summaryCase->summaryReader() )
|
||||
{
|
||||
reader->createAndSetAddresses();
|
||||
}
|
||||
summaryCase->onCalculationUpdated();
|
||||
}
|
||||
summaryCase->onCalculationUpdated();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -83,9 +85,12 @@ void RimSummaryCalculationCollection::updateDataDependingOnCalculations()
|
||||
}
|
||||
}
|
||||
|
||||
for ( auto ensemble : summaryCaseCollection->summaryEnsembles() )
|
||||
if ( auto summaryCaseCollection = RiaSummaryTools::summaryCaseMainCollection() )
|
||||
{
|
||||
ensemble->onCalculationUpdated();
|
||||
for ( auto ensemble : summaryCaseCollection->summaryEnsembles() )
|
||||
{
|
||||
ensemble->onCalculationUpdated();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -696,6 +696,7 @@ std::vector<RimSummaryCase*> RimSummaryTable::getToplevelSummaryCases() const
|
||||
{
|
||||
RimSummaryCaseMainCollection* summaryCaseMainCollection = RiaSummaryTools::summaryCaseMainCollection();
|
||||
if ( !summaryCaseMainCollection ) return {};
|
||||
|
||||
return summaryCaseMainCollection->topLevelSummaryCases();
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user