Joakim Hove 3e2df33a65 Merge remote-tracking branch 'upstream/opm-parser-integrate' into wellsmanager-rates ... Conflicts: opm/core/wells/WellsManager.cpp		2014-01-30 09:50:09 +01:00
..
linalg	Fix LinearSolverIstl cleanup also for fast AMG branch	2013-09-20 10:00:21 +02:00
pressure	Implemented well_controls based on well_controls_get_xxx() functions.	2014-01-06 14:59:11 +01:00
props	Added namespace prefix to enum.	2014-01-30 08:00:45 +01:00
simulator	Phase pressure is used for surface volumes calculations	2014-01-10 16:07:02 +01:00
tof	convert users of MESSAGE to OPM_MESSAGE	2013-09-05 13:04:38 +02:00
transport	Remove unneeded term, fixing oil injecting behaviour.	2013-10-04 13:16:02 +02:00
utility	Implemented well_controls based on well_controls_iset_xxx() functions.	2014-01-06 14:19:09 +01:00
wells	Merge remote-tracking branch 'upstream/opm-parser-integrate' into wellsmanager-rates	2014-01-30 09:50:09 +01:00
well_controls.h	Merge remote-tracking branch 'upstream/opm-parser-integrate' into wellsmanager-rates	2014-01-30 09:50:09 +01:00
wells.h	Merge remote-tracking branch 'upstream/opm-parser-integrate' into wellsmanager-rates	2014-01-30 09:50:09 +01:00