From d613639abce5ceaa4bd89880264e1fd9c7d7d680 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Mon, 3 Apr 2017 20:49:54 +0200 Subject: [PATCH] #1371 opm-parser : Removed unused code --- .../FileInterface/RifReaderEclipseOutput.cpp | 16 ---------------- .../FileInterface/RifReaderEclipseOutput.h | 1 - 2 files changed, 17 deletions(-) diff --git a/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp b/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp index 829737ea06..36f957728c 100644 --- a/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp +++ b/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp @@ -24,7 +24,6 @@ #include "RifEclipseOutputFileTools.h" #include "RifEclipseRestartFilesetAccess.h" #include "RifEclipseUnifiedRestartFileAccess.h" -#include "RifReaderOpmParserInput.h" #include "RigActiveCellInfo.h" #include "RigCaseCellResultsData.h" @@ -391,7 +390,6 @@ bool RifReaderEclipseOutput::open(const QString& fileName, RigEclipseCaseData* e { cvf::Collection faults; - //importFaultsOpmParser(fileSet, &faults); importFaults(fileSet, &faults); RigMainGrid* mainGrid = eclipseCase->mainGrid(); @@ -438,20 +436,6 @@ bool RifReaderEclipseOutput::open(const QString& fileName, RigEclipseCaseData* e return true; } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RifReaderEclipseOutput::importFaultsOpmParser(const QStringList& fileSet, cvf::Collection* faults) const -{ - foreach(QString fname, fileSet) - { - if (fname.endsWith(".DATA")) - { - RifReaderOpmParserInput::readFaults(fname, faults); - } - } -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/FileInterface/RifReaderEclipseOutput.h b/ApplicationCode/FileInterface/RifReaderEclipseOutput.h index aef7025aa3..c4b31d6c9e 100644 --- a/ApplicationCode/FileInterface/RifReaderEclipseOutput.h +++ b/ApplicationCode/FileInterface/RifReaderEclipseOutput.h @@ -71,7 +71,6 @@ private: static RigWellResultPoint createWellResultPoint(const RigGridBase* grid, const well_conn_type* ert_connection, int ertBranchId, int ertSegmentId, const char* wellName); - void importFaultsOpmParser(const QStringList& fileSet, cvf::Collection* faults) const; void importFaults(const QStringList& fileSet, cvf::Collection* faults);