Joakim Hove 2c05b6a1b4 Merge remote-tracking branch 'upstream/master' into opm-parser-integrate

2014-02-05 23:06:54 +01:00

..

linalg

Fix initialisation warning.

2014-02-05 13:05:33 +01:00

pressure

Implemented well_controls based on well_controls_get_xxx() functions.

2014-01-06 14:59:11 +01:00

props

Merged upstream/master

2014-02-04 21:42:07 +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

Removed WELTARG commented code, moved wellperf_data into createWellsFromSpecs function

2014-02-03 09:22:28 +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