Liu Ming db103c7868 Merge remote branch 'remotes/opm/master' into relpermDiagnostics ... Conflicts: CMakeLists_files.cmake		2015-12-08 16:08:02 +08:00
..
flowdiagnostics	use the error macros from opm-common	2015-10-08 11:42:15 +02:00
linalg	Return a constant reference to the mask for ParallelISTLInformation::updateOwnerMask	2015-11-02 15:02:32 +01:00
pressure	use the error macros from opm-common	2015-10-08 11:42:15 +02:00
props	Merge remote branch 'remotes/opm/master' into relpermDiagnostics	2015-12-08 16:08:02 +08:00
simulator	Use cell depths based on averaging cell corners	2015-11-24 10:17:12 +01:00
transport	PVT properties: allow them to be temperature dependent	2014-12-01 20:06:31 +01:00
utility	use the error macros from opm-common	2015-10-08 11:42:15 +02:00
wells	Renamed well_index to well_index_on_proc and added comment.	2015-10-28 13:09:12 +01:00
well_controls.h	Initial integration of VFP	2015-08-19 13:10:48 +02:00
wells.h	Avoid using bool in the c code	2015-10-07 12:49:05 +02:00