Liu Ming 009f1b101b Merge remote branch 'remotes/opm/master' into update_relperm_diagnostics ...

Conflicts:
	opm/core/props/satfunc/RelpermDiagnostics.cpp

2016-01-22 13:04:01 +08:00

..

flowdiagnostics

use the error macros from opm-common

2015-10-08 11:42:15 +02:00

grid

Fixes includes wrt opm-parser PR-656

2016-01-21 09:42:51 +01:00

io

Fixes includes wrt opm-parser PR-656

2016-01-21 09:42:51 +01:00

linalg

Return a constant reference to the mask for ParallelISTLInformation::updateOwnerMask

2015-11-02 15:02:32 +01:00

pressure

use the error macros from opm-common

2015-10-08 11:42:15 +02:00

props

Merge remote branch 'remotes/opm/master' into update_relperm_diagnostics

2016-01-22 13:04:01 +08:00

simulator

Fixes includes wrt opm-parser PR-656

2016-01-21 09:42:51 +01:00

transport

use the error macros from opm-common

2015-10-08 11:42:15 +02:00

utility

Added TableColumn based overloads.

2016-01-06 09:19:47 +01:00

wells

Fixes includes wrt opm-parser PR-656

2016-01-21 09:42:51 +01:00

doxygen_main.hpp

remove the EclipseGridParser class

2014-05-21 11:22:43 +02:00

grid.h

Added small utility memcmp_double()

2015-08-12 14:31:07 +02:00

opm-core-pch.hpp

Use precompiled headers to compile C++ modules

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

well_controls.h

Initial integration of VFP

2015-08-19 13:10:48 +02:00

wells.h

Avoid using bool in the c code

2015-10-07 12:49:05 +02:00