Atgeirr Flø Rasmussen e644c51750 Merge branch 'master' into support-resv ...

Conflicts:
	examples/sim_fibo_ad.cpp
	examples/sim_fibo_ad_cp.cpp
	opm/autodiff/SimulatorFullyImplicitBlackoil.hpp
	opm/autodiff/SimulatorFullyImplicitBlackoil_impl.hpp

2014-08-19 09:53:20 +02:00

..

mrst

Move MRST example closer to actual example

2013-05-15 10:37:50 +02:00

find_zero.cpp

Rename AutoDiff::Forward -> Opm::AutoDiff.

2013-09-19 11:32:47 +02:00

sim_2p_comp_ad.cpp

DerivedGeology: pass the EclipseState object to its constructor

2014-07-24 16:37:38 +02:00

sim_2p_incomp_ad.cpp

glue in support for property modifiers

2014-06-09 12:36:46 +02:00

sim_fibo_ad_cp.cpp

Merge branch 'master' into support-resv

2014-08-19 09:53:20 +02:00

sim_fibo_ad.cpp

Remove superfluous output and use const.

2014-08-12 12:53:11 +02:00

sim_simple.cpp

Rename AutoDiff::ForwardBlock -> Opm::AutoDiffBlock.

2013-09-19 12:53:28 +02:00