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

#4520 Report identical fault errors only once.

Browse Source
This commit is contained in:
Gaute Lindkvist
2019-07-26 11:36:40 +02:00
parent a7879813c9
commit 17ee6627bb
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp
View File

@@ -1640,6 +1640,9 @@ void RifEclipseInputFileTools::readFaults(QFile& data,
// qDebug() << "Reading faults from\n " << data.fileName(); // qDebug() << "Reading faults from\n " << data.fileName();
std::set<QString> errorMessages;
std::set<QString> warningMessages;
RigFault* fault = nullptr; RigFault* fault = nullptr;
do do
@@ -1655,7 +1658,7 @@ void RifEclipseInputFileTools::readFaults(QFile& data,
else if (line.startsWith("/", Qt::CaseInsensitive)) else if (line.startsWith("/", Qt::CaseInsensitive))
{ {
// Detected end of keyword data section // Detected end of keyword data section
return; break;
} }
else if (line.startsWith(editKeyword, Qt::CaseInsensitive)) else if (line.startsWith(editKeyword, Qt::CaseInsensitive))
{ {
@@ -1666,7 +1669,7 @@ void RifEclipseInputFileTools::readFaults(QFile& data,
*isEditKeywordDetected = true; *isEditKeywordDetected = true;
} }
return; break;
} }
// Replace tab with space to be able to split the string using space as splitter // Replace tab with space to be able to split the string using space as splitter
@@ -1704,14 +1707,14 @@ void RifEclipseInputFileTools::readFaults(QFile& data,
if (faultName.contains(' ')) if (faultName.contains(' '))
{ {
RiaLogging::error(QString("Fault name '%1' contains spaces").arg(faultName)); errorMessages.insert(QString("Fault name '%1' contains spaces").arg(faultName));
continue; continue;
} }
else if (faultName.length() > 8) else if (faultName.length() > 8)
{ {
// Keep going anyway, eclipse files sometimes have longer than // Keep going anyway, eclipse files sometimes have longer than
// the specified 8 characters in the name without Eclipse complaining // the specified 8 characters in the name without Eclipse complaining
RiaLogging::warning(QString("Fault name '%1' is longer than 8 characters").arg(faultName)); warningMessages.insert(QString("Fault name '%1' is longer than 8 characters").arg(faultName));
} }
int i1, i2, j1, j2, k1, k2; int i1, i2, j1, j2, k1, k2;
@@ -1760,4 +1763,14 @@ void RifEclipseInputFileTools::readFaults(QFile& data,
fault->addCellRangeForFace(cellFaceEnum, cellrange); fault->addCellRangeForFace(cellFaceEnum, cellrange);
} while (!data.atEnd()); } while (!data.atEnd());
for (QString errorMessage : errorMessages)
{
RiaLogging::error(errorMessage);
}
for (QString warningMessage : warningMessages)
{
RiaLogging::warning(warningMessage);
}
} }