Markus Blatt 21864388bd 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
Description
Simulator programs and utilities for automatic differentiation.
70 MiB
Languages
C++ 78.3%
ECL 17.7%
CMake 1.8%
Cuda 1.2%
Shell 0.5%
Other 0.5%