Bård Skaflestad a784d50f1e Merge branch 'master' into blattms-master-refactor-for-cpgrid-support ...

Conflicts:
	examples/sim_fibo_ad.cpp
	opm/autodiff/FullyImplicitBlackoilSolver_impl.hpp

This brings the "CpGrid support" branch up to date with respect to
recent changes in opm-autodiff master.

2014-04-08 16:31:17 +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

Removed calls to WellsManager() constructor which uses old EclipseGridParser.

2014-03-25 19:36:42 +01:00

sim_2p_incomp_ad.cpp

Removed calls to WellsManager() constructor which uses old EclipseGridParser.

2014-03-25 19:36:42 +01:00

sim_fibo_ad_cp.cpp

Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support

2014-03-25 11:11:08 +01:00

sim_fibo_ad.cpp

Merge branch 'master' into blattms-master-refactor-for-cpgrid-support

2014-04-08 16:31:17 +02:00

sim_simple.cpp

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

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

test_impestpfa_ad.cpp

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

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

test_implicit_ad.cpp

Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support

2014-03-25 11:11:08 +01:00