Atgeirr Flø Rasmussen 03f6f43160 Merge branch 'master' into nonuniform_fluid_tables ...

Conflicts:
	Makefile.am
	opm/core/fluid/BlackoilPropertiesFromDeck.hpp
	opm/core/fluid/SaturationPropsFromDeck.cpp
	opm/core/fluid/SaturationPropsFromDeck.hpp
	opm/core/fluid/blackoil/BlackoilPvtProperties.cpp
	opm/core/fluid/blackoil/BlackoilPvtProperties.hpp
	opm/core/fluid/blackoil/SinglePvtDead.cpp

This merge combines three more-or-less orthogonal features
for saturation tables: the option to use StoneII or Simple
three-phase behaviour, the option to fit a spline or not,
and finally setting the number of samples used (if spline
fitting).

Interfaces have changed, the most top-level one being
that BlackoilPropertiesFromDeck::init() now also takes
a ParameterGroup argument.

2012-09-04 11:42:31 +02:00

..

fluid

Merge branch 'master' into nonuniform_fluid_tables

2012-09-04 11:42:31 +02:00

linalg

Restore coding conventions.

2012-08-14 11:05:09 +02:00

pressure

Merge remote-tracking branch 'atgeirr/master'

2012-08-27 13:32:55 +02:00

simulator

Added writing of timings in param format

2012-08-21 09:57:36 +02:00

transport/reorder

Corrected comment.

2012-08-28 13:12:54 +02:00

utility

Whitespace cleanup and adding a check for #phases <= 3.

2012-09-03 14:04:52 +02:00

wells

Prune an unused header.

2012-06-19 09:34:34 +02:00

newwells.h

Document add_well()s "name" parameter.

2012-06-18 10:18:14 +02:00

well.h

Document the obsolescent well representation.

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