OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-14 17:32:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Option: Read fault data

Browse Source
This commit is contained in:
Magne Sjaastad committed 2014-01-02 15:10:33 +01:00
1 parent de7dddc25e
commit 183203344b
7 files changed
+14 -14
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp
+2 -2
View File
@@ -67,7 +67,7 @@ RifEclipseInputFileTools::~RifEclipseInputFileTools()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RifEclipseInputFileTools::openGridFile(const QString& fileName, RigCaseData* eclipseCase, bool importFaults)
bool RifEclipseInputFileTools::openGridFile(const QString& fileName, RigCaseData* eclipseCase, bool readFaultData)
{
CVF_ASSERT(eclipseCase);
@@ -168,7 +168,7 @@ bool RifEclipseInputFileTools::openGridFile(const QString& fileName, RigCaseData
progress.setProgress(7);
progress.setProgressDescription("Read faults ...");
if (importFaults)
if (readFaultData)
{
cvf::Collection<RigFault> faults;
RifEclipseInputFileTools::readFaults(fileName, faults, keywordsAndFilePos);
ApplicationCode/FileInterface/RifEclipseInputFileTools.h
+1 -1
View File
@@ -53,7 +53,7 @@ public:
RifEclipseInputFileTools();
virtual ~RifEclipseInputFileTools();
static bool openGridFile(const QString& fileName, RigCaseData* eclipseCase, bool importFaults);
static bool openGridFile(const QString& fileName, RigCaseData* eclipseCase, bool readFaultData);
// Returns map of assigned resultName and Eclipse Keyword.
static std::map<QString, QString> readProperties(const QString& fileName, RigCaseData* eclipseCase);
ApplicationCode/FileInterface/RifReaderInterface.h
+4 -4
View File
@@ -44,11 +44,11 @@ public:
};
public:
RifReaderInterface() { m_enableFaultsImport = false; }
RifReaderInterface() { m_readFaultData = false; }
virtual ~RifReaderInterface() {}
void enableFaultsImport(bool enableFaultsImport) { m_enableFaultsImport = enableFaultsImport; }
bool isFaultImportEnabled() { return m_enableFaultsImport; }
void readFaultData(bool readFaultData) { m_readFaultData = readFaultData; }
bool isFaultImportEnabled() { return m_readFaultData; }
virtual bool open(const QString& fileName, RigCaseData* eclipseCase) = 0;
virtual void close() = 0;
@@ -64,5 +64,5 @@ public:
private:
std::vector<QString> m_filenamesWithFaults;
bool m_enableFaultsImport;
bool m_readFaultData;
};