opm-simulators/opm/core/simulator
Markus Blatt ab5e011f34 Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support
Manually resolved conflicts in:
	opm/core/io/eclipse/EclipseWriter.cpp
	opm/core/io/eclipse/EclipseWriter.hpp
	opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp
2014-04-08 21:50:00 +02: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
EquilibrationHelpers.hpp Some adjustments to equil initialisation. 2014-03-26 14:53:47 +01:00
initState_impl.hpp Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support 2014-03-27 15:27:11 +01:00
initState.hpp Fixed unused parameter warning in initBlackoilStateFromDeck. 2014-02-25 15:10:18 +01:00
initStateEquil_impl.hpp New parser included. 2014-03-28 17:35:43 +01:00
initStateEquil.hpp Equil regions now internally indexed 0..(NTEQUL-1) 2014-03-31 16:16:45 +02: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 Fix logic related to open/shut wells initialisation. 2014-03-14 11:27:20 +01:00