From b1e9e847845d42e68cb214f02f70e9d02591dbdf Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Thu, 10 Aug 2017 11:14:32 +0200 Subject: [PATCH] #1691 Removed unused function and cleaned up includes and whitespace --- .../FileInterface/RifReaderEclipseOutput.h | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/ApplicationCode/FileInterface/RifReaderEclipseOutput.h b/ApplicationCode/FileInterface/RifReaderEclipseOutput.h index 55f0ec81ca..cf621be718 100644 --- a/ApplicationCode/FileInterface/RifReaderEclipseOutput.h +++ b/ApplicationCode/FileInterface/RifReaderEclipseOutput.h @@ -24,9 +24,6 @@ #include "cvfCollection.h" -#include -#include - class RifEclipseOutputFileTools; class RifEclipseRestartDataAccess; class RigGridBase; @@ -73,9 +70,7 @@ private: void importFaults(const QStringList& fileSet, cvf::Collection* faults); - void openInitFile(); - bool openDynamicAccess(); void extractResultValuesBasedOnPorosityModel(PorosityModelResultType matrixOrFracture, std::vector* values, const std::vector& fileValues); void transferNNCData( const ecl_grid_type * mainEclGrid , const ecl_file_type * init_file, @@ -86,15 +81,16 @@ private: QStringList validKeywordsForPorosityModel(const QStringList& keywords, const std::vector& keywordDataItemCounts, const RigActiveCellInfo* activeCellInfo, const RigActiveCellInfo* fractureActiveCellInfo, PorosityModelResultType matrixOrFracture, size_t timeStepCount) const; virtual std::vector timeSteps(); -private: - QString m_fileName; // Name of file used to start accessing Eclipse output files - QStringList m_filesWithSameBaseName; // Set of files in filename's path with same base name as filename - RigEclipseCaseData* m_eclipseCase; +private: + QString m_fileName; // Name of file used to start accessing Eclipse output files + QStringList m_filesWithSameBaseName; // Set of files in filename's path with same base name as filename + + RigEclipseCaseData* m_eclipseCase; std::vector m_timeSteps; std::vector m_daysSinceSimulationStart; - ecl_file_type* m_ecl_init_file; // File access to static results - cvf::ref m_dynamicResultsAccess; // File access to dynamic results + ecl_file_type* m_ecl_init_file; // File access to static results + cvf::ref m_dynamicResultsAccess; // File access to dynamic results };