Liu Ming db103c7868 Merge remote branch 'remotes/opm/master' into relpermDiagnostics ...

Conflicts:
	CMakeLists_files.cmake

2015-12-08 16:08:02 +08:00

..

pvt

use the error macros from opm-common

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

rock

Make constructor taking one argument explicit.

2015-10-28 13:19:42 +01:00

satfunc

Use OpmLog to output messages.

2015-12-02 10:58:06 +08:00

BlackoilPhases.hpp

Add a facility for checking/assigning presence of free phases

2013-12-03 15:56:18 +01:00

BlackoilPropertiesBasic.cpp

use the error macros from opm-common

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

BlackoilPropertiesBasic.hpp

PVT properties: allow them to be temperature dependent

2014-12-01 20:06:31 +01:00

BlackoilPropertiesFromDeck.cpp

Moved compressedToCartesian() to its own file.

2015-09-15 14:13:58 +02:00

BlackoilPropertiesFromDeck.hpp

implement determining the threshold pressure from the initial condition

2015-11-05 12:29:19 +01:00

BlackoilPropertiesInterface.hpp

PVT properties: allow them to be temperature dependent

2014-12-01 20:06:31 +01:00

IncompPropertiesBasic.cpp

use the error macros from opm-common

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

IncompPropertiesBasic.hpp

Use markdown for parameter lists.

2013-03-22 10:02:04 +01:00

IncompPropertiesFromDeck.cpp

use the error macros from opm-common

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

IncompPropertiesFromDeck.hpp

SaturationPropsFromDeck: remove the 'SatFuncSet' template parameter

2015-06-29 14:49:20 +02:00

IncompPropertiesInterface.hpp

Moved fluid -> props and subdirs.

2013-03-14 09:56:48 +01:00

IncompPropertiesShadow_impl.hpp

use the error macros from opm-common

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

IncompPropertiesShadow.hpp

Use underscore for data members

2013-07-30 13:24:57 +02:00

IncompPropertiesSinglePhase.cpp

use the error macros from opm-common

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

IncompPropertiesSinglePhase.hpp

Add IncompPropertiesSinglePhase class.

2015-01-20 15:47:50 +01:00

phaseUsageFromDeck.hpp

use the error macros from opm-common

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