#7965 Import ensemble: Add option to group import of multiple ensembles

ApplicationLibCode/Application/Tools/RiaEnsembleNameTools.cpp

@@ -28,6 +28,63 @@
 ///
 //--------------------------------------------------------------------------------------------------
 QString RiaEnsembleNameTools::findSuitableEnsembleName( const QStringList& fileNames )
+{
+    QStringList iterations = findUniqueIterations( fileNames );
+    if ( iterations.size() == 1u )
+    {
+        return iterations.front();
+    }
+
+    if ( !iterations.empty() )
+    {
+        return QString( "Multiple iterations: %1" ).arg( iterations.join( ", " ) );
+    }
+
+    QString root = RiaFilePathTools::commonRootOfFileNames( fileNames );
+
+    QRegularExpression trimRe( "[^a-zA-Z0-9]+$" );
+    QString            trimmedRoot = root.replace( trimRe, "" );
+    if ( trimmedRoot.length() >= 4 )
+    {
+        return trimmedRoot;
+    }
+
+    return "Ensemble";
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+std::vector<QStringList> RiaEnsembleNameTools::groupFilesByEnsemble( const QStringList& fileNames )
+{
+    QStringList iterations = findUniqueIterations( fileNames );
+    if ( iterations.size() <= 1 )
+    {
+        // All the files are in the same ensemble
+        return { fileNames };
+    }
+
+    std::vector<QStringList> groupedByIteration;
+    for ( auto iteration : iterations )
+    {
+        QStringList fileNamesFromIteration;
+        for ( auto filePath : fileNames )
+        {
+            if ( filePath.contains( iteration ) )
+            {
+                fileNamesFromIteration << filePath;
+            }
+        }
+        groupedByIteration.push_back( fileNamesFromIteration );
+    }
+
+    return groupedByIteration;
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+QStringList RiaEnsembleNameTools::findUniqueIterations( const QStringList& fileNames )
 {
     std::vector<QStringList> componentsForAllFilePaths;
 
@@ -55,27 +112,7 @@ QString RiaEnsembleNameTools::findSuitableEnsembleName( const QStringList& fileN
     }
 
     iterations.removeDuplicates();
-
+    return iterations;
-    if ( iterations.size() == 1u )
-    {
-        return iterations.front();
-    }
-
-    if ( !iterations.empty() )
-    {
-        return QString( "Multiple iterations: %1" ).arg( iterations.join( ", " ) );
-    }
-
-    QString root = RiaFilePathTools::commonRootOfFileNames( fileNames );
-
-    QRegularExpression trimRe( "[^a-zA-Z0-9]+$" );
-    QString            trimmedRoot = root.replace( trimRe, "" );
-    if ( trimmedRoot.length() >= 4 )
-    {
-        return trimmedRoot;
-    }
-
-    return "Ensemble";
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/Application/Tools/RiaEnsembleNameTools.h

@@ -20,6 +20,7 @@
 
 #include <QString>
 #include <map>
+#include <vector>
 
 //==================================================================================================
 //
@@ -37,4 +38,7 @@ public:
     static QString uniqueShortNameFromComponents( const QString&                        sourceFileName,
                                                   const std::map<QString, QStringList>& keyFileComponentsForAllFiles,
                                                   const QString&                        ensembleCaseName );
+
+    static QStringList              findUniqueIterations( const QStringList& fileNames );
+    static std::vector<QStringList> groupFilesByEnsemble( const QStringList& fileNames );
 };

ApplicationLibCode/Commands/RicCreateEnsembleWellLogFeature.cpp

@@ -223,9 +223,12 @@ void RicCreateEnsembleWellLogFeature::executeCommand( const RicCreateEnsembleWel
 
     if ( ui.autoCreateEnsembleWellLogs() )
     {
-        RimEnsembleWellLogs* ensembleWellLogs =
+        std::vector<RimEnsembleWellLogs*> ensembleWellLogs =
             RicImportEnsembleWellLogsFeature::createEnsembleWellLogsFromFiles( allLasFileNames );
-        if ( ensembleWellLogs )
+
+        for ( auto ensembleWellLog : ensembleWellLogs )
+        {
+            if ( ensembleWellLog )
             {
                 RimEclipseCase* eclipseCase = nullptr;
 
@@ -242,7 +245,7 @@ void RicCreateEnsembleWellLogFeature::executeCommand( const RicCreateEnsembleWel
                     RimWellLogTrack* wellLogTrack =
                         RimcWellLogPlot_newWellLogTrack::createWellLogTrack( wellLogPlot, eclipseCase, wellPath, title );
                     RimEnsembleWellLogCurveSet* ensembleWellLogCurveSet = new RimEnsembleWellLogCurveSet();
-                ensembleWellLogCurveSet->setEnsembleWellLogs( ensembleWellLogs );
+                    ensembleWellLogCurveSet->setEnsembleWellLogs( ensembleWellLog );
                     ensembleWellLogCurveSet->setColor( color );
                     ensembleWellLogCurveSet->setWellLogChannelName( property.first );
                     wellLogTrack->setEnsembleWellLogCurveSet( ensembleWellLogCurveSet );
@@ -256,6 +259,7 @@ void RicCreateEnsembleWellLogFeature::executeCommand( const RicCreateEnsembleWel
             }
         }
     }
+}
 
 //--------------------------------------------------------------------------------------------------
 ///

ApplicationLibCode/Commands/RicImportEnsembleFeature.cpp

@@ -70,13 +70,24 @@ bool RicImportEnsembleFeature::isCommandEnabled()
 //--------------------------------------------------------------------------------------------------
 void RicImportEnsembleFeature::onActionTriggered( bool isChecked )
 {
-    RiaApplication* app           = RiaApplication::instance();
     QString     pathCacheName = "ENSEMBLE_FILES";
     QStringList fileNames =
         RicImportSummaryCasesFeature::runRecursiveSummaryCaseFileSearchDialog( "Import Ensemble", pathCacheName );
 
     if ( fileNames.isEmpty() ) return;
 
+    std::vector<QStringList> groupedByEnsemble = RiaEnsembleNameTools::groupFilesByEnsemble( fileNames );
+    for ( const QStringList& groupedFileNames : groupedByEnsemble )
+    {
+        importSingleEnsemble( groupedFileNames );
+    }
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RicImportEnsembleFeature::importSingleEnsemble( const QStringList& fileNames )
+{
     QString ensembleNameSuggestion = RiaEnsembleNameTools::findSuitableEnsembleName( fileNames );
 
     QString ensembleName = askForEnsembleName( ensembleNameSuggestion );
@@ -102,7 +113,7 @@ void RicImportEnsembleFeature::onActionTriggered( bool isChecked )
     }
 
     std::vector<RimCase*> allCases;
-    app->project()->allCases( allCases );
+    RiaApplication::instance()->project()->allCases( allCases );
 
     if ( allCases.size() == 0 )
     {

ApplicationLibCode/Commands/RicImportEnsembleFeature.h

@@ -37,5 +37,6 @@ protected:
     void onActionTriggered( bool isChecked ) override;
     void setupActionLook( QAction* actionToSetup ) override;
 
-    QString askForEnsembleName( const QString& suggestion );
+    static QString askForEnsembleName( const QString& suggestion );
+    static void    importSingleEnsemble( const QStringList& fileNames );
 };

ApplicationLibCode/Commands/RicImportEnsembleSurfaceFeature.cpp

@@ -76,6 +76,18 @@ void RicImportEnsembleSurfaceFeature::importEnsembleSurfaceFromFiles( const QStr
 {
     if ( fileNames.isEmpty() ) return;
 
+    std::vector<QStringList> groupedByEnsemble = RiaEnsembleNameTools::groupFilesByEnsemble( fileNames );
+    for ( const QStringList& groupedFileNames : groupedByEnsemble )
+    {
+        importSingleEnsembleSurfaceFromFiles( groupedFileNames );
+    }
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RicImportEnsembleSurfaceFeature::importSingleEnsembleSurfaceFromFiles( const QStringList& fileNames )
+{
     // Create a list of file names for each layer
     std::map<QString, QStringList> fileNamesForEachLayer;
     for ( const auto& name : fileNames )
@@ -104,7 +116,7 @@ void RicImportEnsembleSurfaceFeature::importEnsembleSurfaceFromFiles( const QStr
             RiaFilePathTools::keyPathComponentsForEachFilePath( fileNames );
 
         std::vector<RimFileSurface*> surfaces;
-        for ( size_t i = 0; i < fileNames.size(); i++ )
+        for ( int i = 0; i < fileNames.size(); i++ )
         {
             surfaces.push_back( new RimFileSurface );
         }

ApplicationLibCode/Commands/RicImportEnsembleSurfaceFeature.h

@@ -42,6 +42,8 @@ protected:
 
     QStringList runRecursiveFileSearchDialog( const QString& dialogTitle, const QString& pathCacheName );
 
+    static void importSingleEnsembleSurfaceFromFiles( const QStringList& fileNames );
+
 private:
     QString m_pathFilter;
     QString m_fileNameFilter;

ApplicationLibCode/Commands/RicImportEnsembleWellLogsFeature.cpp

@@ -69,7 +69,25 @@ void RicImportEnsembleWellLogsFeature::onActionTriggered( bool isChecked )
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimEnsembleWellLogs* RicImportEnsembleWellLogsFeature::createEnsembleWellLogsFromFiles( const QStringList& fileNames )
+std::vector<RimEnsembleWellLogs*>
+    RicImportEnsembleWellLogsFeature::createEnsembleWellLogsFromFiles( const QStringList& fileNames )
+{
+    std::vector<RimEnsembleWellLogs*> ensembleWellLogs;
+
+    std::vector<QStringList> groupedByEnsemble = RiaEnsembleNameTools::groupFilesByEnsemble( fileNames );
+    for ( const QStringList& groupedFileNames : groupedByEnsemble )
+    {
+        auto ensembleWellLog = createSingleEnsembleWellLogsFromFiles( groupedFileNames );
+        ensembleWellLogs.push_back( ensembleWellLog );
+    }
+
+    return ensembleWellLogs;
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+RimEnsembleWellLogs* RicImportEnsembleWellLogsFeature::createSingleEnsembleWellLogsFromFiles( const QStringList& fileNames )
 {
     if ( fileNames.isEmpty() ) return nullptr;
 

ApplicationLibCode/Commands/RicImportEnsembleWellLogsFeature.h

@@ -33,7 +33,9 @@ class RicImportEnsembleWellLogsFeature : public caf::CmdFeature
 
     RicImportEnsembleWellLogsFeature();
 
-    static RimEnsembleWellLogs* createEnsembleWellLogsFromFiles( const QStringList& fileNames );
+    static RimEnsembleWellLogs* createSingleEnsembleWellLogsFromFiles( const QStringList& fileNames );
+
+    static std::vector<RimEnsembleWellLogs*> createEnsembleWellLogsFromFiles( const QStringList& fileNames );
 
 protected:
     // Overrides