Bård Skaflestad d3f85ea60c Merge remote-tracking branch 'upstream/master' into ert ...

Conflicts:
	Makefile.am
	opm/core/grid/cpgpreprocess/preprocess.h
	tests/Makefile.am

This brings ert branch up-to-date with current Github master branch.

2012-10-12 00:43:51 +02:00

..

fluid

Fix comment.

2012-10-10 14:12:38 +02:00

linalg

Disable warning for using DUNE's FieldVector::size

2012-09-24 00:21:06 +02:00

pressure

Update WellState::perfPress() after pressure solve.

2012-10-01 16:40:10 +02:00

simulator

Added perfPress() to WellState.

2012-10-01 16:39:35 +02:00

transport/reorder

Whitespace cleanup.

2012-10-09 12:21:17 +02:00

utility

Merge remote-tracking branch 'upstream/master' into ert

2012-10-12 00:43:51 +02:00

wells

sign error in total_produced

2012-10-09 15:23:56 +02:00

newwells.h

New function clone_wells()

2012-10-05 10:14:44 +02:00

well.h

Document the obsolescent well representation.

2012-06-25 00:55:50 +02:00