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

Restart files. Fix bug during import of grid summary cases

Browse Source
This commit is contained in:
Bjørn Erik Jensen 2018-04-09 10:53:51 +02:00
parent e4ef9bd014
commit c69b558ff8
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ApplicationCode/FileInterface/RifSummaryCaseRestartSelector.cpp
View File

@ -20,6 +20,7 @@
#include "RiaApplication.h"
#include "RiaPreferences.h"
#include "RiaFilePathTools.h"
#include "RicSummaryCaseRestartDialog.h"
@ -117,28 +118,36 @@ std::vector<RifSummaryCaseFileInfo> RifSummaryCaseRestartSelector::getFilesToImp
std::vector<RifSummaryCaseFileInfo> RifSummaryCaseRestartSelector::getFilesToImportUsingPrefs(const QStringList& initialFiles,
RiaPreferences::SummaryRestartFilesImportModeType summaryRestartMode)
{
std::set<RifSummaryCaseFileInfo> filesToImport;
std::vector<RifSummaryCaseFileInfo> filesToImport;
RicSummaryCaseRestartDialogResult lastResult;
for (const QString& file : initialFiles)
for (const QString& initialFile : initialFiles)
{
QString file = RiaFilePathTools::toInternalSeparator(initialFile);
if (summaryRestartMode == RiaPreferences::IMPORT)
{
filesToImport.insert(RifSummaryCaseFileInfo(file, true));
filesToImport.push_back(RifSummaryCaseFileInfo(file, true));
}
else if (summaryRestartMode == RiaPreferences::NOT_IMPORT)
{
filesToImport.insert(RifSummaryCaseFileInfo(file, false));
filesToImport.push_back(RifSummaryCaseFileInfo(file, false));
}
else if (summaryRestartMode == RiaPreferences::SEPARATE_CASES)
{
filesToImport.insert(RifSummaryCaseFileInfo(file, false));
filesToImport.push_back(RifSummaryCaseFileInfo(file, false));
RifReaderEclipseSummary reader;
std::vector<RifRestartFileInfo> restartFileInfos = reader.getRestartFiles(file);
for (const auto& fi : restartFileInfos)
filesToImport.insert(RifSummaryCaseFileInfo(fi.fileName, false));
for (const auto& rfi : restartFileInfos)
{
RifSummaryCaseFileInfo fi(rfi.fileName, false);
if (!vectorContains(filesToImport, fi))
{
filesToImport.push_back(fi);
}
}
}
}
return std::vector<RifSummaryCaseFileInfo>(filesToImport.begin(), filesToImport.end());
return filesToImport;
}