Liu Ming 9a41199bd4 Merge remote-tracking branch 'opm/master' into fim ...

Conflicts:
	cmake/Modules/Findopm-autodiff.cmake

2014-09-23 16:04:15 +08:00

..

sim_2p_fim.cpp

fix FullyImplicitTwophasePolymersolver constructor problem.

2013-12-09 22:57:44 +08:00

sim_2p_fincomp_ad.cpp

add the bhp well controls.

2013-12-17 17:36:43 +08:00

sim_fi2p_incomp_ad.cpp

add well controls for polymer, but rate control just for

2013-12-24 17:31:11 +08:00

sim_poly2p_comp_reorder.cpp

adapt the the table related API changes of opm-parser

2014-09-17 13:28:39 +02:00

sim_poly2p_fincomp_ad.cpp

remove some output commits.

2013-12-11 18:27:05 +08:00

sim_poly2p_incomp_reorder.cpp

adapt the the table related API changes of opm-parser

2014-09-17 13:28:39 +02:00

sim_poly_fi2p_comp_ad.cpp

output watercut by using utilities.cpp/computeInjectedProduced function.

2014-01-22 14:17:04 +08:00

sim_poly_fi2p_incomp_ad.cpp

add well controls for polymer, but rate control just for

2013-12-24 17:31:11 +08:00

test_singlecellsolves.cpp

move the code away from EclipsGridParser to opm-parser

2014-04-26 11:13:59 +02:00