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.

examples/sim_2p_comp_reorder.cpp

@@ -94,8 +94,7 @@ main(int argc, char** argv)
         // Grid init
         grid.reset(new GridManager(*deck));
         // Rock and fluid init
-        bool props_use_spline = param.getDefault("props_use_spline", true);
-        props.reset(new BlackoilPropertiesFromDeck(*deck, *grid->c_grid(), props_use_spline));
+        props.reset(new BlackoilPropertiesFromDeck(*deck, *grid->c_grid(), param));
         // check_well_controls = param.getDefault("check_well_controls", false);
         // max_well_control_iterations = param.getDefault("max_well_control_iterations", 10);
         // Rock compressibility.

examples/sim_wateroil.cpp

@@ -175,8 +175,7 @@ main(int argc, char** argv)
         // Grid init
         grid.reset(new Opm::GridManager(deck));
         // Rock and fluid init
-        bool props_use_spline = param.getDefault("props_use_spline", true);
-        props.reset(new BlackoilPropertiesFromDeck(deck, *grid->c_grid(), props_use_spline));
+        props.reset(new BlackoilPropertiesFromDeck(deck, *grid->c_grid(), param));
         // Wells init.
         wells.reset(new Opm::WellsManager(deck, *grid->c_grid(), props->permeability()));
         check_well_controls = param.getDefault("check_well_controls", false);