Merge branch 'master' into hdf-prototype

This commit is contained in:
Bjørnar Grip Fjær
2017-06-22 10:16:09 +02:00
3912 changed files with 18718 additions and 174224 deletions

View File

@@ -45,6 +45,7 @@ public:
void setSourSimFileName(const QString& fileName);
virtual bool openEclipseGridFile();
virtual void reloadEclipseGridFile();
bool openAndReadActiveCellData(RigEclipseCaseData* mainEclipseCase);
void readGridDimensions(std::vector< std::vector<int> >& gridDimensions);