Merged in changes from maintenance branch

This commit is contained in:
Magne Sjaastad
2016-08-04 11:12:53 +02:00
49 changed files with 849 additions and 196 deletions

View File

@@ -28,6 +28,8 @@ class RifEclipseOutputFileTools;
#include "ert/ecl_well/well_info.h"
//==================================================================================================
//
// Class for access to results from a unified restart file
@@ -44,7 +46,7 @@ public:
void close();
size_t timeStepCount();
std::vector<QDateTime> timeSteps();
std::vector<QDateTime> timeSteps();
std::vector<int> reportNumbers();
void resultNames(QStringList* resultNames, std::vector<size_t>* resultDataItemCounts);
@@ -56,7 +58,6 @@ public:
private:
bool openFile();
private:
QString m_filename;
ecl_file_type* m_ecl_file;