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

#1769 Add time step filtering when importing model

Browse Source 
Move import code from RiaApplication to command feature
Show time step selection UI when importing Eclipse data
Support time step reading of HDF data
This commit is contained in:
Magne Sjaastad
2017-08-25 06:51:56 +02:00
parent d344cf11a2
commit cb506cf86d
24 changed files with 843 additions and 449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp
View File

@@ -93,11 +93,19 @@ RimEclipseResultCase::RimEclipseResultCase()
//--------------------------------------------------------------------------------------------------
bool RimEclipseResultCase::openEclipseGridFile()
{
caf::ProgressInfo progInfo(50, "Reading Eclipse Grid File");
return importGridAndResultMetaData(false);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimEclipseResultCase::importGridAndResultMetaData(bool showTimeStepFilter)
{
caf::ProgressInfo progInfo(50, "Reading Eclipse Grid File");
progInfo.setProgressDescription("Open Grid File");
progInfo.setNextProgressIncrement(48);
progInfo.setProgressDescription("Open Grid File");
progInfo.setNextProgressIncrement(48);
// Early exit if data is already read
if (m_gridAndWellDataIsReadFromFile) return true;
@@ -115,24 +123,59 @@ bool RimEclipseResultCase::openEclipseGridFile()
}
RiaPreferences* prefs = RiaApplication::instance()->preferences();
readerInterface = new RifReaderEclipseOutput;
readerInterface->setReaderSetting(prefs->readerSettings());
readerInterface->setFilenamesWithFaults(this->filesContainingFaults());
cvf::ref<RifReaderEclipseOutput> readerEclipseOutput = new RifReaderEclipseOutput;
readerEclipseOutput->setReaderSetting(prefs->readerSettings());
readerEclipseOutput->setFilenamesWithFaults(this->filesContainingFaults());
if (!m_timeStepFilter->timeStepIndicesToImport().empty())
if (showTimeStepFilter)
{
readerInterface->setTimeStepFilter(m_timeStepFilter->timeStepIndicesToImport());
cvf::ref<RifEclipseRestartDataAccess> restartDataAccess = RifEclipseOutputFileTools::createDynamicResultAccess(caseFileName());
if (restartDataAccess.isNull())
{
return false;
}
{
std::vector<QDateTime> timeSteps;
std::vector<double> daysSinceSimulationStart;
restartDataAccess->timeSteps(&timeSteps, &daysSinceSimulationStart);
// Show GUI to select time steps
RimTimeStepFilter myTimeStepFilter;
myTimeStepFilter.setCustomTimeSteps(timeSteps);
caf::PdmUiPropertyViewDialog propertyDialog(NULL, &myTimeStepFilter, "Time Step Filter", "", QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
propertyDialog.resize(QSize(400, 200));
if (propertyDialog.exec() != QDialog::Accepted)
{
return false;
}
m_timeStepFilter->setSelectedTimeStepIndices(myTimeStepFilter.selectedTimeStepIndices());
}
readerEclipseOutput->setFileDataAccess(restartDataAccess.p());
}
if (!m_timeStepFilter->selectedTimeStepIndices().empty())
{
readerEclipseOutput->setTimeStepFilter(m_timeStepFilter->selectedTimeStepIndices());
}
cvf::ref<RigEclipseCaseData> eclipseCase = new RigEclipseCaseData;
if (!readerInterface->open(caseFileName(), eclipseCase.p()))
if (!readerEclipseOutput->open(caseFileName(), eclipseCase.p()))
{
return false;
}
this->setFilesContainingFaults(readerInterface->filenamesWithFaults());
this->setFilesContainingFaults(readerEclipseOutput->filenamesWithFaults());
this->setReservoirData( eclipseCase.p() );
this->setReservoirData(eclipseCase.p());
readerInterface = readerEclipseOutput;
}
results(RiaDefines::MATRIX_MODEL)->setReaderInterface(readerInterface.p());
@@ -163,7 +206,7 @@ bool RimEclipseResultCase::openEclipseGridFile()
}
return true;
}
}
//--------------------------------------------------------------------------------------------------
///