Markus Blatt 7fd5b65691 Merge remote-tracking branch 'upstream/master' into parallel-solver-support ...

Removed conflicts in:
	opm/core/linalg/LinearSolverIstl.cpp

2014-04-04 20:38:52 +02:00

..

linalg

Merge remote-tracking branch 'upstream/master' into parallel-solver-support

2014-04-04 20:38:52 +02:00

pressure

Changed open / close behaviour of well_controls: 1) well_controls has an explicit open_close flag. 2) Will NOT flip current value to change open|close status

2014-03-04 20:23:19 +01:00

props

Merge pull request #528 from blattms/fix-nonunifom

2014-03-19 12:31:05 +01:00

simulator

Merge pull request #508 from atgeirr/adjust-initial-wellrates

2014-03-15 14:59:27 +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

Bugfix: skin factor, not diameter.

2014-03-31 14:47:16 +02:00

well_controls.h

Changed open / close behaviour of well_controls: 1) well_controls has an explicit open_close flag. 2) Will NOT flip current value to change open|close status

2014-03-04 20:23:19 +01:00

wells.h

Merge remote-tracking branch 'upstream/opm-parser-integrate' into wellsmanager-rates

2014-01-30 09:50:09 +01:00