opm-simulators/opm/simulators
Halvor Møll Nilsen 7f3cbc476a Merge remote-tracking branch 'upstream/master'
Conflicts:
	opm/core/simulator/SimulatorIncompTwophase.cpp
2012-08-24 12:26:27 +02:00
..
SimulatorIncompTwophase.cpp Merge remote-tracking branch 'upstream/master' 2012-08-24 12:26:27 +02:00
SimulatorIncompTwophase.hpp Added well constraint checking to SimulatorIncompTwophase. 2012-08-21 10:51:14 +02:00