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

(#928) Remove import of faults using opm-parser

Browse Source
This commit is contained in:
Magne Sjaastad
2016-10-21 09:33:03 +02:00
parent 1fd5ffb522
commit 7a9c0871e8
3 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp
View File

@@ -634,20 +634,6 @@ void RifEclipseInputFileTools::readFaults(const QString& fileName, const std::ve
return;
}
// Parse complete file if no keywords are parsed
if (fileKeywords.size() == 0)
{
qint64 filePos = findKeyword(faultsKeyword, data, 0);
while (filePos != -1)
{
readFaults(data, filePos, faults, NULL);
filePos = findKeyword(faultsKeyword, data, filePos);
}
return;
}
for (size_t i = 0; i < fileKeywords.size(); i++)
{
if (fileKeywords[i].keyword.compare(editKeyword, Qt::CaseInsensitive) == 0)
@@ -671,6 +657,25 @@ void RifEclipseInputFileTools::readFaults(const QString& fileName, const std::ve
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RifEclipseInputFileTools::parseAndReadFaults(const QString& fileName, cvf::Collection<RigFault>* faults)
{
QFile data(fileName);
if (!data.open(QFile::ReadOnly))
{
return;
}
qint64 filePos = findKeyword(faultsKeyword, data, 0);
while (filePos != -1)
{
readFaults(data, filePos, faults, NULL);
filePos = findKeyword(faultsKeyword, data, filePos);
}
}
//--------------------------------------------------------------------------------------------------
///