OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-01 03:37:15 -06:00
Code Issues Packages Projects Releases Wiki Activity

#2033 SourSim : Guard for invalid index and show more error reports

Browse Source
This commit is contained in:
Magne Sjaastad 2017-10-23 20:12:21 +02:00
parent da8fd7038f
commit 8cde20d662
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp
View File

@ -482,22 +482,42 @@ void RifReaderEclipseOutput::setHdf5FileName(const QString& fileName)
if (!hdf5ReaderInterface)
{
RiaLogging::error("HDF: Failed to import Sour Sim data ");
return;
}
std::vector<QDateTime> sourSimTimeSteps = hdf5ReaderInterface->timeSteps();
if (sourSimTimeSteps.size() == 0)
{
RiaLogging::error("HDF: No data available from SourSim");
return;
}
if (timeStepInfos.size() > 0)
{
bool isTimeStampsEqual = true;
if (allTimeSteps().size() != sourSimTimeSteps.size())
{
RiaLogging::error(QString("HDF: Time step count mismatch, Eclipse : %1 ; HDF : %2 ").arg(allTimeSteps().size()).arg(sourSimTimeSteps.size()));
return;
}
bool isTimeStampsEqual = true;
for (size_t i = 0; i < timeStepInfos.size(); i++)
{
size_t indexOnFile = timeStepIndexOnFile(i);
if (!isEclipseAndSoursimTimeStepsEqual(timeStepInfos[i].m_date, sourSimTimeSteps[indexOnFile]))
if (indexOnFile < sourSimTimeSteps.size())
{
if (!isEclipseAndSoursimTimeStepsEqual(timeStepInfos[i].m_date, sourSimTimeSteps[indexOnFile]))
{
isTimeStampsEqual = false;
}
}
else
{
RiaLogging::error(QString("HDF: Time step count mismatch, Eclipse : %1 ; HDF : %2 ").arg(timeStepInfos.size()).arg(sourSimTimeSteps.size()));
// We have less soursim time steps than eclipse time steps
isTimeStampsEqual = false;
}
}