Merge branch 'cpr-preconditioning' into cpr-preconditioning-again

Conflicts:
	examples/sim_fibo_ad.cpp
	examples/test_implicit_ad.cpp
	opm/autodiff/FullyImplicitBlackoilSolver.cpp
	opm/autodiff/SimulatorFullyImplicitBlackoil.cpp
	opm/autodiff/SimulatorFullyImplicitBlackoil.hpp

examples/sim_fibo_ad.cpp

@@ -37,6 +37,7 @@
 #include <opm/core/props/rock/RockCompressibility.hpp>
 
 #include <opm/core/linalg/LinearSolverFactory.hpp>
+#include <opm/autodiff/FullyImplicitSystemSolverSimple.hpp>
 
 #include <opm/core/simulator/BlackoilState.hpp>
 #include <opm/autodiff/WellStateFullyImplicitBlackoil.hpp>
@@ -141,6 +142,7 @@ try
 
     // Linear solver.
     LinearSolverFactory linsolver(param);
+    FullyImplicitSystemSolverSimple fis_solver(linsolver);
 
     // Write parameters used for later reference.
     bool output = param.getDefault("output", true);
@@ -210,7 +212,7 @@ try
                                                  *new_props,
                                                  rock_comp->isActive() ? rock_comp.get() : 0,
                                                  wells,
-                                                 linsolver,
+                                                 fis_solver,
                                                  grav);
         SimulatorReport episodeReport = simulator.run(simtimer, state, well_state);
 

examples/test_implicit_ad.cpp

@@ -24,6 +24,7 @@
 #include <opm/autodiff/GeoProps.hpp>
 #include <opm/autodiff/BlackoilPropsAd.hpp>
 #include <opm/autodiff/WellStateFullyImplicitBlackoil.hpp>
+#include <opm/autodiff/FullyImplicitSystemSolverSimple.hpp>
 
 #include <opm/core/grid.h>
 #include <opm/core/wells.h>
@@ -103,8 +104,9 @@ try
     Opm::DerivedGeology geo(*g, props, grav);
 
     Opm::LinearSolverFactory linsolver(param);
+    Opm::FullyImplicitSystemSolverSimple fis_solver(linsolver);
 
-    Opm::FullyImplicitBlackoilSolver solver(*g, props, geo, 0, *wells, linsolver);
+    Opm::FullyImplicitBlackoilSolver solver(*g, props, geo, 0, *wells, fis_solver);
 
     Opm::BlackoilState state;
     initStateBasic(*g, props0, param, 0.0, state);