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

#4204 Export faults as part of visible grid export

Browse Source 
#4204 Enable reading of faults from a different file than the main grid file
This commit is contained in:
Gaute Lindkvist
2019-03-21 10:35:52 +01:00
parent 88d2ad2c35
commit 677f42591b
11 changed files with 360 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
ApplicationCode/ProjectDataModel/RimEclipseInputCase.cpp
View File

@@ -21,6 +21,7 @@
#include "RimEclipseInputCase.h"
#include "RiaFieldHandleTools.h"
#include "RiaLogging.h"
#include "RiaPreferences.h"
#include "RifEclipseInputFileTools.h"
@@ -109,14 +110,17 @@ bool RimEclipseInputCase::openDataFileSet(const QStringList& fileNames)
this->setReservoirData(new RigEclipseCaseData(this));
}
bool importFaults = RiaApplication::instance()->preferences()->readerSettings()->importFaults();
std::vector<QString> allErrorMessages;
// First find and read the grid data
if (this->eclipseCaseData()->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->eclipseCaseData(), prefs->readerSettings()->importFaults()))
QString errorMessages;
if (RifEclipseInputFileTools::openGridFile(fileNames[i], this->eclipseCaseData(), importFaults, &errorMessages))
{
m_gridFileName = fileNames[i];
@@ -131,11 +135,22 @@ bool RimEclipseInputCase::openDataFileSet(const QStringList& fileNames)
break;
}
else
{
allErrorMessages.push_back(errorMessages);
}
}
}
if (this->eclipseCaseData()->mainGrid()->gridPointDimensions() == cvf::Vec3st(0,0,0))
{
if (!allErrorMessages.empty())
{
for (QString errorMessages : allErrorMessages)
{
RiaLogging::error(errorMessages);
}
}
return false; // No grid present
}
@@ -171,6 +186,17 @@ bool RimEclipseInputCase::openDataFileSet(const QStringList& fileNames)
inputProperty->resolvedState = RimEclipseInputProperty::RESOLVED;
m_inputPropertyCollection->inputProperties.push_back(inputProperty);
}
if (importFaults)
{
cvf::Collection<RigFault> faultCollection;
RifEclipseInputFileTools::parseAndReadFaults(propertyFileName, &faultCollection);
if (!faultCollection.empty())
{
this->eclipseCaseData()->mainGrid()->setFaults(faultCollection);
}
}
}
return true;
}