Markus Blatt c6daebc35d Merge branch 'refactor-for-cpgrid-support' into master-refactor-for-cpgrid-support ... Manually resolved conflicts in: opm/core/props/BlackoilPropertiesFromDeck.cpp opm/core/wells/WellsManager.cpp		2014-03-13 13:41:45 +01:00
..
BlackoilState.cpp	Refactored parts needed for Blackoil in autodiff to get rid of UG dependency.	2014-02-17 13:23:01 +01:00
BlackoilState.hpp	Refactored parts needed for Blackoil in autodiff to get rid of UG dependency.	2014-02-17 13:23:01 +01:00
initState_impl.hpp	Added missing namespace qualifiers.	2014-02-25 15:10:46 +01:00
initState.hpp	Fixed unused parameter warning in initBlackoilStateFromDeck.	2014-02-25 15:10:18 +01:00
SimulatorReport.cpp	make config.h the first header to be included in any compile unit	2013-04-10 12:56:14 +02:00
SimulatorReport.hpp	Added writing of timings in param format	2012-08-21 09:57:36 +02:00
TwophaseState_impl.hpp	Extract common parts of blackoil and incomp. state	2013-11-13 13:48:28 +01:00
TwophaseState.hpp	Extract common parts of blackoil and incomp. state	2013-11-13 13:48:28 +01:00
WellState.hpp	Changed open / close behaviour of well_controls: 1) well_controls has an explicit open_close flag. 2) Will NOT flip current value to change open|close status	2014-03-04 20:23:19 +01:00