OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-18 21:43:27 -06:00
Code Issues Packages Projects Releases Wiki Activity
7aa8728be9
opm-simulators/opm/core/simulator
History
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
..
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 '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
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