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

Faults: Eclipse input case use preferences to control import of faults

Browse Source
This commit is contained in:
Magne Sjaastad
2013-12-20 09:18:52 +01:00
parent b7141dde50
commit 59eeb0894f
8 changed files with 28 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ApplicationCode/ProjectDataModel/RimInputCase.cpp
View File

@@ -103,9 +103,11 @@ void RimInputCase::openDataFileSet(const QStringList& fileNames)
// First find and read the grid data
if (this->reservoirData()->mainGrid()->gridPointDimensions() == cvf::Vec3st(0,0,0))
{
RiaPreferences* prefs = RiaApplication::instance()->preferences();
for (int i = 0; i < fileNames.size(); i++)
{
if (RifEclipseInputFileTools::openGridFile(fileNames[i], this->reservoirData()))
if (RifEclipseInputFileTools::openGridFile(fileNames[i], this->reservoirData(), prefs->enableFaultsImport()))
{
m_gridFileName = fileNames[i];
@@ -188,8 +190,11 @@ bool RimInputCase::openEclipseGridFile()
}
else
{
cvf::ref<RigCaseData> eclipseCase = new RigCaseData;
RiaPreferences* prefs = RiaApplication::instance()->preferences();
readerInterface = new RifReaderEclipseInput;
readerInterface->enableFaultsImport(prefs->enableFaultsImport());
cvf::ref<RigCaseData> eclipseCase = new RigCaseData;
if (!readerInterface->open(m_gridFileName, eclipseCase.p()))
{
return false;