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

#1691 File Interface : Add support for time step filtering

Browse Source
This commit is contained in:
Magne Sjaastad
2017-08-10 13:08:38 +02:00
parent 9223282db4
commit 66c28d8cee
4 changed files with 74 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp
View File

@@ -657,9 +657,27 @@ void RifReaderEclipseOutput::buildMetaData()
progInfo.incrementProgress();
std::vector<int> reportNumbers;
// Get time steps
m_dynamicResultsAccess->timeSteps(&timeSteps, &daysSinceSimulationStart);
std::vector<int> reportNumbers = m_dynamicResultsAccess->reportNumbers();
{
std::vector<QDateTime> timeStepsOnFile;
std::vector<double> daysSinceSimulationStartOnFile;
std::vector<int> reportNumbersOnFile;
m_dynamicResultsAccess->timeSteps(&timeStepsOnFile, &daysSinceSimulationStartOnFile);
reportNumbersOnFile = m_dynamicResultsAccess->reportNumbers();
for (size_t i = 0; i < timeStepsOnFile.size(); i++)
{
if (this->isTimeStepIncludedByFilter(i))
{
timeSteps.push_back(timeStepsOnFile[i]);
daysSinceSimulationStart.push_back(daysSinceSimulationStartOnFile[i]);
reportNumbers.push_back(reportNumbersOnFile[i]);
}
}
}
QStringList resultNames;
std::vector<size_t> resultNamesDataItemCounts;
@@ -857,8 +875,10 @@ bool RifReaderEclipseOutput::dynamicResult(const QString& result, PorosityModelR
if (m_dynamicResultsAccess.notNull())
{
size_t indexOnFile = timeStepIndexOnFile(stepIndex);
std::vector<double> fileValues;
if (!m_dynamicResultsAccess->results(result, stepIndex, m_eclipseCase->mainGrid()->gridCount(), &fileValues))
if (!m_dynamicResultsAccess->results(result, indexOnFile, m_eclipseCase->mainGrid()->gridCount(), &fileValues))
{
return false;
}