Atgeirr Flø Rasmussen a6d3e2eef4 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
..
sim_2p_comp_reorder.cpp	Merge branch 'master' into nonuniform_fluid_tables	2012-09-04 11:42:31 +02:00