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

#2714 Display a warning in origin summary import dialog when ecllib may fail to read origin files

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2018-04-17 11:01:24 +02:00
parent a8fb4469b4
commit 7afa753d11
5 changed files with 81 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
ApplicationCode/FileInterface/RifReaderEclipseSummary.cpp
View File

@@ -22,8 +22,6 @@
#include "RifReaderEclipseOutput.h"
#include "RifEclipseSummaryTools.h"
#include "RiaLogging.h"
#include <string>
#include <assert.h>
@@ -137,10 +135,14 @@ bool RifReaderEclipseSummary::open(const QString& headerFileName, bool includeRe
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RifRestartFileInfo> RifReaderEclipseSummary::getRestartFiles(const QString& headerFileName)
std::vector<RifRestartFileInfo> RifReaderEclipseSummary::getRestartFiles(const QString& headerFileName, bool* hasWarnings)
{
CVF_ASSERT(hasWarnings);
std::vector<RifRestartFileInfo> restartFiles;
m_warnings.clear();
*hasWarnings = false;
RifRestartFileInfo currFile;
currFile.fileName = headerFileName;
while(!currFile.fileName.isEmpty())
@@ -152,10 +154,41 @@ std::vector<RifRestartFileInfo> RifReaderEclipseSummary::getRestartFiles(const Q
// Fix to stop potential infinite loop
if (currFile.fileName == prevFile)
{
RiaLogging::error("RifReaderEclipseSummary: Restart file reference loop detected");
m_warnings.push_back("RifReaderEclipseSummary: Restart file reference loop detected");
*hasWarnings = true;
break;
}
// Due to a weakness in libecl regarding restart summary header file selection,
// do some extra checking
{
QString formattedHeaderExtension = ".FSMSPEC";
QString nonformattedHeaderExtension = ".SMSPEC";
QString formattedDataFileExtension = ".FUNSMRY";
if (currFile.fileName.endsWith(nonformattedHeaderExtension, Qt::CaseInsensitive))
{
QString formattedHeaderFile = currFile.fileName;
formattedHeaderFile.replace(nonformattedHeaderExtension, formattedHeaderExtension, Qt::CaseInsensitive);
QString formattedDateFile = currFile.fileName;
formattedDateFile.replace(nonformattedHeaderExtension, formattedDataFileExtension, Qt::CaseInsensitive);
QFileInfo nonformattedHeaderFileInfo = QFileInfo(currFile.fileName);
QFileInfo formattedHeaderFileInfo = QFileInfo(formattedHeaderFile);
QFileInfo formattedDateFileInfo = QFileInfo(formattedDateFile);
if (formattedHeaderFileInfo.lastModified() < nonformattedHeaderFileInfo.lastModified() &&
formattedHeaderFileInfo.exists() && !formattedDateFileInfo.exists())
{
m_warnings.push_back(QString("RifReaderEclipseSummary: Formatted summary header file without an\n") +
QString("associated data file detected.\n") +
QString("This may cause a failure reading summary origin data.\n") +
QString("To avoid this problem, please delete or rename the.FSMSPEC file."));
*hasWarnings = true;
break;
}
}
}
if (!currFile.fileName.isEmpty())
restartFiles.push_back(currFile);
}