diff --git a/ApplicationLibCode/Application/Tools/RiaImportEclipseCaseTools.cpp b/ApplicationLibCode/Application/Tools/RiaImportEclipseCaseTools.cpp index ccd0c91bf6..04bee50ea1 100644 --- a/ApplicationLibCode/Application/Tools/RiaImportEclipseCaseTools.cpp +++ b/ApplicationLibCode/Application/Tools/RiaImportEclipseCaseTools.cpp @@ -121,7 +121,7 @@ bool RiaImportEclipseCaseTools::openEclipseCasesFromFile( const QStringList& for ( RimSummaryCase* newSumCase : candidateCases ) { RimSummaryCaseCollection* existingCollection = nullptr; - auto existingSummaryCase = sumCaseColl->findSummaryCaseFromFileName( newSumCase->summaryHeaderFilename() ); + auto existingSummaryCase = sumCaseColl->findTopLevelSummaryCaseFromFileName( newSumCase->summaryHeaderFilename() ); if ( existingSummaryCase ) { existingSummaryCase->firstAncestorOrThisOfType( existingCollection ); diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp index 58ec9da21e..1d7a0bd4a2 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp @@ -119,7 +119,7 @@ RimSummaryCase* RimSummaryCaseMainCollection::findSummaryCaseFromEclipseResultCa auto summaryFileName = helper.findSummaryFileCandidates(); for ( const auto& candidateFileName : summaryFileName ) { - auto summaryCase = findSummaryCaseFromFileName( candidateFileName ); + auto summaryCase = findTopLevelSummaryCaseFromFileName( candidateFileName ); if ( summaryCase ) { return summaryCase; @@ -132,9 +132,9 @@ RimSummaryCase* RimSummaryCaseMainCollection::findSummaryCaseFromEclipseResultCa //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimSummaryCase* RimSummaryCaseMainCollection::findSummaryCaseFromFileName( const QString& fileName ) const +RimSummaryCase* RimSummaryCaseMainCollection::findTopLevelSummaryCaseFromFileName( const QString& fileName ) const { - for ( const auto& summaryCase : allSummaryCases() ) + for ( const auto& summaryCase : topLevelSummaryCases() ) { if ( summaryCase->summaryHeaderFilename() == fileName ) { @@ -553,7 +553,7 @@ std::vector { QCoreApplication::processEvents( QEventLoop::ExcludeUserInputEvents ); - auto existingSummaryCase = findSummaryCaseFromFileName( fileInfo.summaryFileName() ); + auto existingSummaryCase = findTopLevelSummaryCaseFromFileName( fileInfo.summaryFileName() ); if ( !existingSummaryCase ) { const QString& smspecFileName = fileInfo.summaryFileName(); diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.h b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.h index 502395205f..598dbd1008 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.h +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.h @@ -55,7 +55,7 @@ public: bool showProgress = false ); RimSummaryCase* findSummaryCaseFromEclipseResultCase( const RimEclipseResultCase* eclResCase ) const; - RimSummaryCase* findSummaryCaseFromFileName( const QString& fileName ) const; + RimSummaryCase* findTopLevelSummaryCaseFromFileName( const QString& fileName ) const; void addCases( const std::vector cases ); void addCase( RimSummaryCase* summaryCase );