diff --git a/opm/autodiff/CPRPreconditioner.hpp b/opm/autodiff/CPRPreconditioner.hpp index 276acee73..84afac7f5 100644 --- a/opm/autodiff/CPRPreconditioner.hpp +++ b/opm/autodiff/CPRPreconditioner.hpp @@ -264,8 +264,7 @@ createEllipticPreconditionerPointer(const M& Ae, double relax, //Dune::SeqILU0* ilu=new Dune::SeqILU0(Ae, relax); typedef typename CPRSelector > ::EllipticPreconditionerPointer EllipticPreconditionerPointer; - return EllipticPreconditionerPointer(new ParallelPreconditioner(Ae, comm, relax));//, - // createParallelDeleter(*ilu, comm)); + return EllipticPreconditionerPointer(new ParallelPreconditioner(Ae, comm, relax)); } #endif } // end namespace diff --git a/opm/autodiff/NewtonIterationBlackoilInterleaved.cpp b/opm/autodiff/NewtonIterationBlackoilInterleaved.cpp index 763cbdf29..a8088c154 100644 --- a/opm/autodiff/NewtonIterationBlackoilInterleaved.cpp +++ b/opm/autodiff/NewtonIterationBlackoilInterleaved.cpp @@ -143,50 +143,15 @@ namespace Opm #if HAVE_MPI typedef Dune::OwnerOverlapCopyCommunication Comm; - //typedef Dune::BlockPreconditioner ParPreconditioner; typedef ParallelOverlappingILU0 ParPreconditioner; template - std::unique_ptr */ - > + std::unique_ptr constructPrecond(Operator& opA, const Comm& comm) const { - typedef AdditionalObjectDeleter Deleter; - //typedef std::unique_ptr Pointer; typedef std::unique_ptr Pointer; const double relax = 1.0; return Pointer(new ParPreconditioner(opA.getmat(), comm, relax)); - /* - - int ilu_setup_successful = 1; - std::string message; - const double relax = 1.0; - SeqPreconditioner* seq_precond = nullptr; - try { - seq_precond = new SeqPreconditioner(opA.getmat(), relax); - } - catch ( Dune::MatrixBlockError error ) - { - message = error.what(); - std::cerr<<"Exception occured on process " << - comm.communicator().rank() << " during " << - "setup of ILU0 preconditioner with message: " << - message<