Atgeirr Flø Rasmussen a07d894500 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

..

parameters

Corrected typo in comments.

2012-04-12 18:11:24 +02:00

Average.hpp

Changed namespace Dune -> namespace Opm.

2012-01-19 13:50:57 +01:00

buildUniformMonotoneTable.hpp

Moved UniformTableLinear and related func out of subnamespace utils.

2012-04-19 11:45:52 +02:00

ColumnExtract.hpp

Reorganized, added opm/core/wells/ and opm/core/simulator/.

2012-06-05 15:42:49 +02:00

ErrorMacros.hpp

Imported items from dune-cornerpoint/dune/common.

2011-12-19 11:34:50 +01:00

Factory.hpp

opm-core: make it work nicely with clang

2012-07-05 12:42:49 +02:00

have_boost_redef.hpp

Add facility for overriding `HAVE_BOOST' from Dune.

2012-07-12 14:20:59 +02:00

initState_impl.hpp

Added more checks in 3-phase init code.

2012-09-03 13:54:50 +02:00

initState.hpp

Added initBlackoilSurfvol() function.

2012-05-21 14:03:56 +02:00

linearInterpolation.hpp

Changed to extrapolation outside tables for pormult. Added facetags to the grid structure. Changed default fluid to Linear.

2012-08-14 09:36:19 +02:00

linInt.hpp

Changed namespace Dune -> namespace Opm.

2012-01-19 13:50:57 +01:00

miscUtilities.cpp

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

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

miscUtilities.hpp

Fixed comment.

2012-09-03 12:26:22 +02:00

miscUtilitiesBlackoil.cpp

Switch loop ordering for better cache performance.

2012-08-27 13:17:27 +02:00

miscUtilitiesBlackoil.hpp

Whitespace cleanup.

2012-08-23 08:59:09 +02:00

MonotCubicInterpolator.cpp

Reference class header from canonical position.

2012-06-22 19:32:18 +02:00

MonotCubicInterpolator.hpp

opm-core: make it work nicely with clang

2012-07-05 12:42:49 +02:00

NonuniformTableLinear.hpp

Added class SinglePvtDead, add parameter 'props_use_spline' to simulators.

2012-08-27 16:48:21 +02:00

RootFinders.hpp

Comment and indent bracketZero().

2012-06-04 16:54:41 +02:00

SparseTable.hpp

Reference <ErrorMacros.hpp> from canonical location.

2012-06-22 19:35:19 +02:00

SparseVector.hpp

Reference <ErrorMacros.hpp> from canonical location.

2012-06-22 19:35:19 +02:00

StopWatch.cpp

Reference headers from canonical locations.

2012-06-22 19:33:36 +02:00

StopWatch.hpp

Mark return values as \return rather than \ret.

2012-07-02 12:55:28 +02:00

UniformTableLinear.hpp

Formatting fixes.

2012-09-03 15:07:03 +02:00

Units.hpp

Hook file into Doxygen.

2012-07-18 11:00:50 +02:00

writeVtkData.cpp

Added fixes and assertions suggested by static analysis.

2012-04-23 13:28:18 +02:00

writeVtkData.hpp

Changed some function signatures to take const UnstructuredGrid& instead of ptr.

2012-03-12 13:44:05 +01:00