Markus Blatt c282949400 Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support
Manually resolved conflicts:
	opm/core/io/eclipse/EclipseWriter.cpp
	opm/core/io/eclipse/EclipseWriter.hpp
	opm/core/props/BlackoilPropertiesFromDeck.cpp
	opm/core/simulator/initState_impl.hpp
	opm/core/wells/WellsManager.cpp
	opm/core/wells/WellsManager.hpp
2014-03-27 15:27:11 +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%