Remove obsolete libecl-based RifReaderEclipseRft, use RifReaderOpmRft only

ApplicationLibCode/ProjectDataModel/Flow/RimWellPltPlot.cpp

@@ -24,7 +24,7 @@
 #include "RiaQDateTimeTools.h"
 #include "RiaWellNameComparer.h"
 
-#include "RifReaderEclipseRft.h"
+#include "RifReaderRftInterface.h"
 
 #include "RigCaseCellResultsData.h"
 #include "RigEclipseCaseData.h"

ApplicationLibCode/ProjectDataModel/Flow/RimWellRftPlot.cpp

@@ -25,7 +25,7 @@
 #include "RiaSimWellBranchTools.h"
 #include "Summary/RiaSummaryTools.h"
 
-#include "RifReaderEclipseRft.h"
+#include "RifReaderRftInterface.h"
 
 #include "RigCaseCellResultsData.h"
 #include "RigEclipseCaseData.h"

ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.cpp

@@ -34,7 +34,6 @@
 #include "RifEclipseRestartDataAccess.h"
 #include "RifInputPropertyLoader.h"
 #include "RifReaderEclipseOutput.h"
-#include "RifReaderEclipseRft.h"
 #include "RifReaderMockModel.h"
 #include "RifReaderOpmCommon.h"
 #include "RifReaderOpmCommonActive.h"
@@ -84,7 +83,6 @@ CAF_PDM_SOURCE_INIT( RimEclipseResultCase, "EclipseCase" );
 RimEclipseResultCase::RimEclipseResultCase()
     : m_gridAndWellDataIsReadFromFile( false )
     , m_activeCellInfoIsReadFromFile( false )
-    , m_useOpmRftReader( true )
     , m_rftDataIsReadFromFile( false )
 {
     CAF_PDM_InitScriptableObject( "Eclipse Case", ":/Case48x48.png", "", "The Regular Eclipse Results Case" );
@@ -453,14 +451,7 @@ void RimEclipseResultCase::ensureRftDataIsImported()
 
     if ( rftFileInfo.exists() )
     {
-        if ( m_useOpmRftReader )
-        {
-            m_readerOpmRft = std::make_unique<RifReaderOpmRft>( rftFileInfo.filePath() );
-        }
-        else
-        {
-            m_readerEclipseRft = std::make_unique<RifReaderEclipseRft>( rftFileInfo.filePath() );
-        }
+        m_readerOpmRft = std::make_unique<RifReaderOpmRft>( rftFileInfo.filePath() );
     }
 
     m_rftDataIsReadFromFile = true;
@@ -642,9 +633,7 @@ RifReaderRftInterface* RimEclipseResultCase::rftReader()
 {
     ensureRftDataIsImported();
 
-    if ( m_useOpmRftReader ) return m_readerOpmRft.get();
-
-    return m_readerEclipseRft.get();
+    return m_readerOpmRft.get();
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.h

@@ -31,7 +31,6 @@
 #include <memory>
 
 class RifReaderRftInterface;
-class RifReaderEclipseRft;
 class RifReaderOpmRft;
 class RifReaderInterface;
 class RigFlowDiagSolverInterface;
@@ -101,8 +100,7 @@ private:
 private:
     std::unique_ptr<RigFlowDiagSolverInterface> m_flowDagSolverInterface;
 
-    std::unique_ptr<RifReaderEclipseRft> m_readerEclipseRft;
-    std::unique_ptr<RifReaderOpmRft>     m_readerOpmRft;
+    std::unique_ptr<RifReaderOpmRft> m_readerOpmRft;
 
     caf::PdmProxyValueField<caf::AppEnum<RiaDefines::EclipseUnitSystem>> m_unitSystem;
     caf::PdmChildArrayField<RimFlowDiagSolution*>                        m_flowDiagSolutions;
@@ -112,6 +110,5 @@ private:
 
     bool m_gridAndWellDataIsReadFromFile;
     bool m_activeCellInfoIsReadFromFile;
-    bool m_useOpmRftReader;
     bool m_rftDataIsReadFromFile;
 };

ApplicationLibCode/ProjectDataModel/WellLog/Rim3dWellLogRftCurve.cpp

@@ -20,7 +20,7 @@
 
 #include "RiaQDateTimeTools.h"
 
-#include "RifReaderEclipseRft.h"
+#include "RifReaderRftInterface.h"
 
 #include "Well/RigWellLogCurveData.h"
 

ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogRftCurve.cpp

@@ -32,8 +32,8 @@
 #include "Summary/RiaSummaryTools.h"
 
 #include "RifEclipseRftAddress.h"
-#include "RifReaderEclipseRft.h"
 #include "RifReaderOpmRft.h"
+#include "RifReaderRftInterface.h"
 
 #include "RigEclipseCaseData.h"
 #include "RigMainGrid.h"