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

#2962 Summary import performance. Preliminary optimization of summary groups and ensemble import

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2018-06-06 09:49:46 +02:00
parent 3cf35f673a
commit 11aeda63d9
8 changed files with 37 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ApplicationCode/Commands/RicSummaryCaseRestartDialog.cpp
View File

@@ -246,11 +246,24 @@ RicSummaryCaseRestartDialogResult RicSummaryCaseRestartDialog::openDialog(const
const QString& initialGridFile,
bool failOnSummaryImportError,
bool showApplyToAllWidget,
bool useFirstSummaryCaseAsTemplate,
ImportOptions defaultSummaryImportOption,
ImportOptions defaultGridImportOption,
RicSummaryCaseRestartDialogResult* lastResult,
QWidget* parent)
{
RicSummaryCaseRestartDialogResult dialogResult;
if (lastResult && lastResult->applyToAll && lastResult->summaryImportOption != SEPARATE_CASES)
{
dialogResult = *lastResult;
dialogResult.summaryFiles.clear();
dialogResult.gridFiles.clear();
if (!initialSummaryFile.isEmpty()) dialogResult.summaryFiles.push_back(initialSummaryFile);
if (!initialGridFile.isEmpty()) dialogResult.gridFiles.push_back(initialGridFile);
return dialogResult;
}
RicSummaryCaseRestartDialog dialog(parent);
bool handleSummaryFile = false;
@@ -288,11 +301,9 @@ RicSummaryCaseRestartDialogResult RicSummaryCaseRestartDialog::openDialog(const
defaultGridImportOption,
{},
QStringList({ initialGridFile }),
lastResult && lastResult->applyToAll);
useFirstSummaryCaseAsTemplate || (lastResult && lastResult->applyToAll));
}
RifReaderEclipseSummary reader;
bool hasWarnings = false;
std::vector<RifRestartFileInfo> originFileInfos = reader.getRestartFiles(initialSummaryFile, &hasWarnings);
@@ -303,10 +314,9 @@ RicSummaryCaseRestartDialogResult RicSummaryCaseRestartDialog::openDialog(const
return RicSummaryCaseRestartDialogResult(RicSummaryCaseRestartDialogResult::SUMMARY_OK, NOT_IMPORT, NOT_IMPORT,
QStringList({ initialSummaryFile }),
QStringList({ initialGridFile }),
lastResult->applyToAll);
useFirstSummaryCaseAsTemplate || lastResult->applyToAll);
}
RicSummaryCaseRestartDialogResult dialogResult;
if (lastResult && lastResult->applyToAll)
{
dialogResult = *lastResult;
@@ -385,7 +395,7 @@ RicSummaryCaseRestartDialogResult RicSummaryCaseRestartDialog::openDialog(const
// Set properties and show dialog
dialog.setWindowTitle("Origin Files");
dialog.m_buttons->button(QDialogButtonBox::Apply)->setVisible(showApplyToAllWidget);
dialog.m_buttons->button(QDialogButtonBox::Apply)->setVisible(!useFirstSummaryCaseAsTemplate && showApplyToAllWidget);
dialog.resize(DEFAULT_DIALOG_WIDTH, DEFAULT_DIALOG_INIT_HEIGHT);
QApplication::setOverrideCursor(QCursor(Qt::ArrowCursor));
@@ -404,7 +414,7 @@ RicSummaryCaseRestartDialogResult RicSummaryCaseRestartDialog::openDialog(const
dialog.selectedGridImportOption(),
{},
{},
dialog.okToAllSelected());
useFirstSummaryCaseAsTemplate || dialog.okToAllSelected());
}
if (dialogResult.status != RicSummaryCaseRestartDialogResult::SUMMARY_OK)