Markus Blatt 3aad1a6cc5 Merge remote-tracking branch 'origin/opm-parser-integrate' into refactor-for-cpgrid-support ...

Resolved Conflicts:
	opm/core/props/BlackoilPropertiesFromDeck.cpp
	opm/core/props/rock/RockFromDeck.hpp
	opm/core/props/satfunc/SaturationPropsFromDeck.hpp
	opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp

2014-02-19 15:22:18 +01:00

..

RockBasic.cpp

make config.h the first header to be included in any compile unit

2013-04-10 12:56:14 +02:00

RockBasic.hpp

Moved fluid -> props and subdirs.

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

RockCompressibility.cpp

more typos

2014-02-10 14:49:58 +01:00

RockCompressibility.hpp

add variants of all methods which take a deck of the new parser to the rock properties

2014-02-10 14:49:58 +01:00

RockFromDeck.cpp

Merge remote-tracking branch 'origin/opm-parser-integrate' into refactor-for-cpgrid-support

2014-02-19 15:22:18 +01:00

RockFromDeck.hpp

Merge remote-tracking branch 'origin/opm-parser-integrate' into refactor-for-cpgrid-support

2014-02-19 15:22:18 +01:00