OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into hdf-prototype

Browse Source
This commit is contained in:
Magne Sjaastad
2017-04-20 13:05:04 +02:00
parent 3d7c6a4234 bd47826608
commit d364e045aa
3089 changed files with 298754 additions and 130927 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ApplicationCode/FileInterface/RifReaderEclipseOutput.h
View File

@@ -75,7 +75,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<RigFault>* faults) const;
void importFaults(const QStringList& fileSet, cvf::Collection<RigFault>* faults);