Magne Sjaastad 36bcdab426 Merge remote-tracking branch 'refs/remotes/origin/dev' ...

Conflicts:
	ApplicationCode/ModelVisualization/RivPipeGeometryGenerator.h
	ApplicationCode/ProjectDataModel/RimEclipseWell.cpp
	ApplicationCode/ProjectDataModel/RimEclipseWell.h
	ApplicationCode/UserInterface/RiuViewerCommands.cpp

2017-01-18 12:19:07 +01:00

..

CMakeLists_files.cmake

#1092 - pre-proto - Added feature for exporting fracture data to file. File is written, but not with any useful information yet.

2017-01-11 14:32:42 +01:00

RifEclipseExportTools.cpp

pre-proto - Rename

2017-01-12 13:29:18 +01:00

RifEclipseExportTools.h

#1092 - pre-proto - Adding function writeFracturesToTextFile which replaces old functions which were separate for SimWellFractures and WellPathFractures.

2017-01-11 14:32:42 +01:00

RifEclipseInputFileTools.cpp

#1068 Renamed to RigEclipseCaseData

2017-01-10 09:51:39 +01:00

RifEclipseInputFileTools.h

Cleaned up includes

2017-01-17 15:11:02 +01:00

RifEclipseOutputFileTools.cpp

Cleaned up includes

2017-01-17 15:11:02 +01:00

RifEclipseOutputFileTools.h

Cleaned up includes

2017-01-17 15:11:02 +01:00

RifEclipseRestartDataAccess.cpp

(#727) Missing Dynamic parameters not reported for intital time step

2016-07-15 09:07:14 +02:00

RifEclipseRestartDataAccess.h

Cleaned up includes

2017-01-17 15:11:02 +01:00

RifEclipseRestartFilesetAccess.cpp

#931 : Avoid null pointer access

2016-10-25 09:00:52 +02:00

RifEclipseRestartFilesetAccess.h

(#727) Missing Dynamic parameters not reported for intital time step

2016-07-15 09:07:14 +02:00

RifEclipseSummaryAddress.cpp

#755 Used the same order as ERT on the display, - and search strings for Summary Variables

2016-06-10 14:11:22 +02:00

RifEclipseSummaryAddress.h

#755 First simple version of the proposed GUI. Type and Quantity name filter working.

2016-06-09 11:08:12 +02:00

RifEclipseSummaryTools.cpp

Fixed a crash if the summary header file is not available

2016-08-03 10:43:45 +02:00

RifEclipseSummaryTools.h

#739 Added summary case classes. Use those from the summary curves. Made save/restore work again for the summary plots. File format for Summary stuff are changed.

2016-05-31 13:48:22 +02:00

RifEclipseUnifiedRestartFileAccess.cpp

Merged in changes from maintenance branch

2016-08-04 11:12:53 +02:00

RifEclipseUnifiedRestartFileAccess.h

Merged in changes from maintenance branch

2016-08-04 11:12:53 +02:00

RifEclipseWellCompletionExporter.cpp

#1069 : pre-proto - Added empty files related to RigFracture

2017-01-02 14:13:34 +01:00

RifEclipseWellCompletionExporter.h

#1069 : pre-proto - Added empty files related to RigFracture

2017-01-02 14:13:34 +01:00

RifJsonEncodeDecode.cpp

Encapsulate the JSON code in a namespace to avoid issues with JSON classes used in opm-parser

2016-06-06 10:43:36 +02:00

RifJsonEncodeDecode.h

Encapsulate the JSON code in a namespace to avoid issues with JSON classes used in opm-parser

2016-06-06 10:43:36 +02:00

RifReaderEclipseInput.cpp

#1068 Renamed to RigEclipseCaseData

2017-01-10 09:51:39 +01:00

RifReaderEclipseInput.h

#1068 Renamed to RigEclipseCaseData

2017-01-10 09:51:39 +01:00

RifReaderEclipseOutput.cpp

Cleaned up includes

2017-01-17 15:11:02 +01:00

RifReaderEclipseOutput.h

Cleaned up includes

2017-01-17 15:11:02 +01:00

RifReaderEclipseSummary.cpp

#859 Added time from start of simulation option

2016-11-22 11:14:02 +01:00

RifReaderEclipseSummary.h

#859 Added time from start of simulation option

2016-11-22 11:14:02 +01:00

RifReaderInterface.cpp

Performance : Now possible to disable load of SOIL on load

2014-10-24 11:38:47 +02:00

RifReaderInterface.h

Cleaned up includes

2017-01-17 15:11:02 +01:00

RifReaderMockModel.cpp

#1123 Fixed missing timestep problem. Using Report Step Number, not timestep index.

2017-01-12 12:07:07 +01:00

RifReaderMockModel.h

#1068 Renamed to RigEclipseCaseData

2017-01-10 09:51:39 +01:00

RifReaderOpmParserInput.cpp

#1068 Renamed to RigEclipseCaseData

2017-01-10 09:51:39 +01:00

RifReaderOpmParserInput.h

#1068 Renamed to RigEclipseCaseData

2017-01-10 09:51:39 +01:00

RifReaderSettings.cpp

Use uiCapability/xmlCapability instead of capability<caf::PdmUiFieldHandle>()(capability<caf::PdmXmlFieldHandle>()

2015-08-05 13:27:36 +02:00

RifReaderSettings.h

Performance : Now possible to disable load of SOIL on load

2014-10-24 11:38:47 +02:00