Fixed filenames for dynamic result access

p4#: 20762

ApplicationCode/FileInterface/RifEclipseRestartDataAccess.h

@@ -42,8 +42,8 @@ public:
     RifEclipseRestartDataAccess();
     virtual ~RifEclipseRestartDataAccess();
 
-    virtual bool                open(const QStringList& fileSet) = 0;
+    virtual bool                open() = 0;
-    virtual void                setFileSet(const QStringList& fileSet) {};
+    virtual void                setFileSet(const QStringList& fileSet) = 0;
     virtual void                close() = 0;
 
     virtual void                setTimeSteps(const QList<QDateTime>& timeSteps) {};

ApplicationCode/FileInterface/RifEclipseRestartFilesetAccess.cpp

@@ -40,7 +40,7 @@ RifEclipseRestartFilesetAccess::~RifEclipseRestartFilesetAccess()
 //--------------------------------------------------------------------------------------------------
 /// Open files
 //--------------------------------------------------------------------------------------------------
-bool RifEclipseRestartFilesetAccess::open(const QStringList& fileSet)
+bool RifEclipseRestartFilesetAccess::open()
 {
     if (m_fileNames.size() > 0)
     {

ApplicationCode/FileInterface/RifEclipseRestartFilesetAccess.h

@@ -35,7 +35,7 @@ public:
     RifEclipseRestartFilesetAccess();
     virtual ~RifEclipseRestartFilesetAccess();
 
-    bool                        open(const QStringList& fileSet);
+    bool                        open();
     void                        setFileSet(const QStringList& fileSet);
     void                        close();
 

ApplicationCode/FileInterface/RifEclipseUnifiedRestartFileAccess.cpp

@@ -44,10 +44,8 @@ RifEclipseUnifiedRestartFileAccess::~RifEclipseUnifiedRestartFileAccess()
 //--------------------------------------------------------------------------------------------------
 /// Open file
 //--------------------------------------------------------------------------------------------------
-bool RifEclipseUnifiedRestartFileAccess::open(const QStringList& fileSet)
+bool RifEclipseUnifiedRestartFileAccess::open()
 {
-    m_filename = fileSet[0];
-
     return true;
 }
 
@@ -155,3 +153,12 @@ void RifEclipseUnifiedRestartFileAccess::readWellData(well_info_type* well_info)
     }
 }
 
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RifEclipseUnifiedRestartFileAccess::setFileSet(const QStringList& fileSet)
+{
+    m_filename = fileSet[0];
+   
+}
+

ApplicationCode/FileInterface/RifEclipseUnifiedRestartFileAccess.h

@@ -37,7 +37,8 @@ public:
     RifEclipseUnifiedRestartFileAccess();
     virtual ~RifEclipseUnifiedRestartFileAccess();
 
-    bool                        open(const QStringList& fileSet);
+    void                        setFileSet(const QStringList& fileSet);
+    bool                        open();
     void                        close();
 
     size_t                      timeStepCount();

ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp

@@ -530,7 +530,7 @@ bool RifReaderEclipseOutput::buildMetaData()
         return false;
     }
 
-    m_dynamicResultsAccess->open(m_fileSet);
+    m_dynamicResultsAccess->open();
 
 
     progInfo.incrementProgress();