OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-24 08:20:01 -06:00
Code Issues Packages Projects Releases Wiki Activity
21864388bd
opm-simulators/opm/core/simulator
History
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
..
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 Merge remote-tracking branch 'origin/opm-parser-integrate' into refactor-for-cpgrid-support 2014-02-19 15:22:18 +01:00
initState.hpp Refactored parts needed for Blackoil in autodiff to get rid of UG dependency. 2014-02-17 13:23:01 +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 Implemented well_controls based on well_controls_get_xxx() functions. 2014-01-06 14:40:55 +01:00