Update CpGrid version to use new classes.

This commit is contained in:
Atgeirr Flø Rasmussen 2014-04-15 12:11:13 +02:00
parent dc622c6a7a
commit 5acb27f506

View File

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