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

Preferences: Read faults on import and fault default visibility

Browse Source
This commit is contained in:
Magne Sjaastad
2013-12-20 08:48:54 +01:00
parent d165d6ce38
commit b7141dde50
6 changed files with 62 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp
View File

@@ -196,6 +196,8 @@ RifReaderEclipseOutput::RifReaderEclipseOutput()
m_ecl_init_file = NULL;
m_dynamicResultsAccess = NULL;
m_enableFaultsImport = true;
}
//--------------------------------------------------------------------------------------------------
@@ -377,37 +379,40 @@ bool RifReaderEclipseOutput::open(const QString& fileName, RigCaseData* eclipseC
progInfo.setProgressDescription("Reading faults");
progInfo.setNextProgressIncrement(10);
if (this->filenamesWithFaults().size() > 0)
if (m_enableFaultsImport)
{
cvf::Collection<RigFault> faults;
std::vector< RifKeywordAndFilePos > fileKeywords;
if (this->filenamesWithFaults().size() > 0)
{
cvf::Collection<RigFault> faults;
std::vector< RifKeywordAndFilePos > fileKeywords;
std::vector<QString> filenamesWithFaults;
std::vector<QString> filenamesWithFaults;
for (size_t i = 0; i < this->filenamesWithFaults().size(); i++)
{
QString faultFilename = this->filenamesWithFaults()[i];
RifEclipseInputFileTools::readFaults(faultFilename, faults, fileKeywords);
RigMainGrid* mainGrid = eclipseCase->mainGrid();
mainGrid->setFaults(faults);
}
}
else
{
foreach (QString fname, fileSet)
{
if (fname.endsWith(".DATA"))
for (size_t i = 0; i < this->filenamesWithFaults().size(); i++)
{
cvf::Collection<RigFault> faults;
std::vector<QString> filenamesWithFaults;
RifEclipseInputFileTools::readFaultsInGridSection(fname, faults, filenamesWithFaults);
QString faultFilename = this->filenamesWithFaults()[i];
RifEclipseInputFileTools::readFaults(faultFilename, faults, fileKeywords);
RigMainGrid* mainGrid = eclipseCase->mainGrid();
mainGrid->setFaults(faults);
}
}
else
{
foreach (QString fname, fileSet)
{
if (fname.endsWith(".DATA"))
{
cvf::Collection<RigFault> faults;
std::vector<QString> filenamesWithFaults;
RifEclipseInputFileTools::readFaultsInGridSection(fname, faults, filenamesWithFaults);
this->setFilenamesWithFaults(filenamesWithFaults);
RigMainGrid* mainGrid = eclipseCase->mainGrid();
mainGrid->setFaults(faults);
this->setFilenamesWithFaults(filenamesWithFaults);
}
}
}
}
@@ -1705,3 +1710,11 @@ std::string RifReaderEclipseOutput::ertGridName(size_t gridNr)
return gridName;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RifReaderEclipseOutput::enableFaultsImport(bool enableFaultsImport)
{
m_enableFaultsImport = enableFaultsImport;
}