Bård Skaflestad 31174cf727 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

..

parameters

Remove a derelict statement inherited from original implementation.

2012-10-05 00:55:14 +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

DataMap.hpp

Added DataMap.hpp

2012-06-28 13:05:33 +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

Typo fix.

2012-09-14 20:56:08 +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

Bugfix: order of function arguments.

2012-10-10 14:09:09 +02:00

miscUtilities.hpp

Fixed comment.

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

miscUtilitiesBlackoil.cpp

Add explanatory comment.

2012-10-02 15:46:33 +02:00

miscUtilitiesBlackoil.hpp

Change interface for (blackoil) computeInjectedProduced().

2012-10-02 11:12:23 +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

Add volumetic unit liter

2012-09-20 15:14:51 +02:00

writeECLData.cpp

Using Opm::unit::convert for seconds -> days conversion.

2012-06-28 16:17:51 +02:00

writeECLData.hpp

Added functionality to save results in ECLIPSE format from ERT libraries.

2012-06-27 20:20:05 +02:00

writeVtkData.cpp

Using Datamapper.h in writeVtkData

2012-06-28 13:20:18 +02:00

writeVtkData.hpp

Using Datamapper.h in writeVtkData

2012-06-28 13:20:18 +02:00