Merge remote-tracking branch 'origin/2018.01.01-patch' into dev

This commit is contained in:
Magne Sjaastad 2018-01-29 08:48:27 +01:00
commit 27ee70f90e
2 changed files with 7 additions and 7 deletions

View File

@ -315,16 +315,13 @@ std::vector<int> RifEclipseRestartFilesetAccess::reportNumbers()
{
std::vector<int> reportNr;
for (size_t i = 0; i < m_ecl_files.size(); i++)
for (const auto* ecl_file : m_ecl_files)
{
if (m_ecl_files[i])
if (ecl_file)
{
const char* fileName = ecl_file_get_src_file(m_ecl_files[i]);
const char* fileName = ecl_file_get_src_file(ecl_file);
int reportNumber = ecl_util_filename_report_nr(fileName);
if (reportNumber != -1)
{
reportNr.push_back(reportNumber);
}
reportNr.push_back(reportNumber);
}
}

View File

@ -2108,6 +2108,9 @@ std::vector<RigEclipseTimeStepInfo> RifReaderEclipseOutput::createFilteredTimeSt
m_dynamicResultsAccess->timeSteps(&timeStepsOnFile, &daysSinceSimulationStartOnFile);
reportNumbersOnFile = m_dynamicResultsAccess->reportNumbers();
if (timeStepsOnFile.size() != daysSinceSimulationStartOnFile.size()) return timeStepInfos;
if (timeStepsOnFile.size() != reportNumbersOnFile.size()) return timeStepInfos;
for (size_t i = 0; i < timeStepsOnFile.size(); i++)
{
if (this->isTimeStepIncludedByFilter(i))