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 'annotation-items' into dev

Browse Source
This commit is contained in:
Magne Sjaastad
2019-03-19 15:00:30 +01:00
parent 28e6bf8d2d 221afb38d3
commit 59c83157d1
45 changed files with 2104 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ApplicationCode/FileInterface/RifReaderEclipseOutput.h
View File

@@ -94,6 +94,7 @@ private:
RigWellResultPoint createWellResultPoint(const RigGridBase* grid, const well_conn_type* ert_connection, int ertBranchId, int ertSegmentId, const char* wellName);
void importFaults(const QStringList& fileSet, cvf::Collection<RigFault>* faults);
void importEquilData(const QStringList& fileSet, RigEclipseCaseData* eclipseCase);
void openInitFile();