Markus Blatt ebc86bc624 Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support ...

Manually resolved conflicts in:
	opm/core/io/eclipse/EclipseWriter.cpp
	opm/core/io/eclipse/EclipseWriter.hpp
	opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp

2014-04-08 21:50:00 +02:00

..

grid

Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support

2014-03-27 15:27:11 +01:00

io

Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support

2014-04-08 21:50:00 +02:00

linalg

Don't reference OwnerOverlap* unless MPI is available

2014-04-07 20:01:18 +02:00

pressure

Removes unused parameter warnings in TransTpfa_impl.hpp.

2014-04-04 21:29:19 +02:00

props

Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support

2014-04-08 21:50:00 +02:00

simulator

Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support

2014-04-08 21:50:00 +02:00

tof

convert users of MESSAGE to OPM_MESSAGE

2013-09-05 13:04:38 +02:00

transport

Remove unneeded term, fixing oil injecting behaviour.

2013-10-04 13:16:02 +02:00

utility

Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support

2014-04-08 21:50:00 +02:00

wells

Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support

2014-04-08 21:50:00 +02:00

doxygen_main.hpp

Moved MonotCubicInterpolator to Opm namespace.

2013-03-21 14:57:36 +01:00

grid.h

Document Cartesian info fields for unstructured grids

2013-09-06 09:51:26 +02:00

opm-core-pch.hpp

Use precompiled headers to compile C++ modules

2013-02-11 22:38:00 +01:00

version.c

Include version information in the library

2013-07-31 12:22:18 +02:00

version.h

Bump version numbers.

2013-10-21 13:53:29 +02:00

well_controls.h

Changed open / close behaviour of well_controls: 1) well_controls has an explicit open_close flag. 2) Will NOT flip current value to change open|close status

2014-03-04 20:23:19 +01:00

wells.h

Changed documentation of Wells::comp_frac to match reality.

2014-04-06 23:45:08 +02:00