OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-08-04 12:53:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into cpr-preconditioning-again

Browse Source 
Conflicts:
	CMakeLists_files.cmake
	examples/test_implicit_ad.cpp
This commit is contained in:
Atgeirr Flø Rasmussen
2014-04-15 11:48:36 +02:00
parent 148e6e78cb 03218f5470
commit 9ae24f9380
23 changed files with 1771 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/test_implicit_ad.cpp
+1 -1
View File
@@ -106,7 +106,7 @@ try
Opm::LinearSolverFactory linsolver(param);
Opm::NewtonIterationBlackoilSimple fis_solver(linsolver);
Opm::FullyImplicitBlackoilSolver solver(*g, props, geo, 0, *wells, fis_solver);
Opm::FullyImplicitBlackoilSolver<UnstructuredGrid> solver(*g, props, geo, 0, *wells, fis_solver);
Opm::BlackoilState state;
initStateBasic(*g, props0, param, 0.0, state);