OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix the fallout of OPM/opm-simulators#1495

Browse Source
This commit is contained in:
Andreas Lauser 2018-08-02 12:23:02 +02:00
parent 076312b28a
commit 61650a22df
1 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
opm/autodiff/ISTLSolverEbos.hpp
View File

@ -450,6 +450,7 @@ namespace Detail
} }
const double relax = parameters_.ilu_relaxation_; const double relax = parameters_.ilu_relaxation_;
const MILU_VARIANT ilu_milu = parameters_.ilu_milu_;
if ( parameters_.use_cpr_ ) if ( parameters_.use_cpr_ )
{ {
using Matrix = typename MatrixOperator::matrix_type; using Matrix = typename MatrixOperator::matrix_type;
@ -462,7 +463,7 @@ namespace Detail
std::unique_ptr< AMG > amg; std::unique_ptr< AMG > amg;
// Construct preconditioner. // Construct preconditioner.
Criterion crit(15, 2000); Criterion crit(15, 2000);
constructAMGPrecond<Criterion>( linearOperator, parallelInformation_arg, amg, opA, relax ); constructAMGPrecond<Criterion>( linearOperator, parallelInformation_arg, amg, opA, relax, ilu_milu );
// Solve. // Solve.
solve(linearOperator, x, istlb, *sp, *amg, result); solve(linearOperator, x, istlb, *sp, *amg, result);
@ -473,7 +474,7 @@ namespace Detail
std::unique_ptr< AMG > amg; std::unique_ptr< AMG > amg;
// Construct preconditioner. // Construct preconditioner.
constructAMGPrecond( linearOperator, parallelInformation_arg, amg, opA, relax ); constructAMGPrecond( linearOperator, parallelInformation_arg, amg, opA, relax, ilu_milu );
// Solve. // Solve.
solve(linearOperator, x, istlb, *sp, *amg, result); solve(linearOperator, x, istlb, *sp, *amg, result);
@ -504,8 +505,11 @@ namespace Detail
std::unique_ptr<SeqPreconditioner> constructPrecond(Operator& opA, const Dune::Amg::SequentialInformation&) const std::unique_ptr<SeqPreconditioner> constructPrecond(Operator& opA, const Dune::Amg::SequentialInformation&) const
{ {
const double relax = parameters_.ilu_relaxation_; const double relax = parameters_.ilu_relaxation_;
const int iluFillin = parameters_.ilu_fillin_level_; const int ilu_fillin = parameters_.ilu_fillin_level_;
std::unique_ptr<SeqPreconditioner> precond(new SeqPreconditioner(opA.getmat(), iluFillin, relax)); const MILU_VARIANT ilu_milu = parameters_.ilu_milu_;
const bool ilu_redblack = parameters_.ilu_redblack_;
const bool ilu_reorder_spheres = parameters_.ilu_reorder_sphere_;
std::unique_ptr<SeqPreconditioner> precond(new SeqPreconditioner(opA.getmat(), ilu_fillin, relax, ilu_milu, ilu_redblack, ilu_reorder_spheres));
return precond; return precond;
} }
@ -527,38 +531,46 @@ namespace Detail
{ {
typedef std::unique_ptr<ParPreconditioner> Pointer; typedef std::unique_ptr<ParPreconditioner> Pointer;
const double relax = parameters_.ilu_relaxation_; const double relax = parameters_.ilu_relaxation_;
return Pointer(new ParPreconditioner(opA.getmat(), comm, relax)); const MILU_VARIANT ilu_milu = parameters_.ilu_milu_;
const bool ilu_redblack = parameters_.ilu_redblack_;
const bool ilu_reorder_spheres = parameters_.ilu_reorder_sphere_;
return Pointer(new ParPreconditioner(opA.getmat(), comm, relax, ilu_milu, ilu_redblack, ilu_reorder_spheres));
} }
#endif #endif
template <class LinearOperator, class MatrixOperator, class POrComm, class AMG > template <class LinearOperator, class MatrixOperator, class POrComm, class AMG >
void void
constructAMGPrecond(LinearOperator& /* linearOperator */, const POrComm& comm, std::unique_ptr< AMG >& amg, std::unique_ptr< MatrixOperator >& opA, const double relax ) const constructAMGPrecond(LinearOperator& /* linearOperator */, const POrComm& comm, std::unique_ptr< AMG >& amg, std::unique_ptr< MatrixOperator >& opA, const double relax, const MILU_VARIANT milu) const
{ {
ISTLUtility::template createAMGPreconditionerPointer<pressureIndex>( *opA, relax, comm, amg ); ISTLUtility::template createAMGPreconditionerPointer<pressureIndex>( *opA, relax, milu, comm, amg );
} }
template <class MatrixOperator, class POrComm, class AMG > template <class MatrixOperator, class POrComm, class AMG >
void void
constructAMGPrecond(MatrixOperator& opA, const POrComm& comm, std::unique_ptr< AMG >& amg, std::unique_ptr< MatrixOperator >&, const double relax ) const constructAMGPrecond(MatrixOperator& opA, const POrComm& comm, std::unique_ptr< AMG >& amg, std::unique_ptr< MatrixOperator >&, const double relax,
const MILU_VARIANT milu) const
{ {
ISTLUtility::template createAMGPreconditionerPointer<pressureIndex>( opA, relax, comm, amg ); ISTLUtility::template createAMGPreconditionerPointer<pressureIndex>( opA, relax,
milu, comm, amg );
} }
template <class C, class LinearOperator, class MatrixOperator, class POrComm, class AMG > template <class C, class LinearOperator, class MatrixOperator, class POrComm, class AMG >
void void
constructAMGPrecond(LinearOperator& /* linearOperator */, const POrComm& comm, std::unique_ptr< AMG >& amg, std::unique_ptr< MatrixOperator >& opA, const double relax ) const constructAMGPrecond(LinearOperator& /* linearOperator */, const POrComm& comm, std::unique_ptr< AMG >& amg, std::unique_ptr< MatrixOperator >& opA, const double relax,
const MILU_VARIANT milu ) const
{ {
ISTLUtility::template createAMGPreconditionerPointer<C>( *opA, relax, comm, amg, parameters_ ); ISTLUtility::template createAMGPreconditionerPointer<C>( *opA, relax,
comm, amg, parameters_ );
} }
template <class C, class MatrixOperator, class POrComm, class AMG > template <class C, class MatrixOperator, class POrComm, class AMG >
void void
constructAMGPrecond(MatrixOperator& opA, const POrComm& comm, std::unique_ptr< AMG >& amg, std::unique_ptr< MatrixOperator >&, const double relax ) const constructAMGPrecond(MatrixOperator& opA, const POrComm& comm, std::unique_ptr< AMG >& amg, std::unique_ptr< MatrixOperator >&, const double relax, const MILU_VARIANT milu ) const
{ {
ISTLUtility::template createAMGPreconditionerPointer<C>( opA, relax, comm, amg, parameters_ ); ISTLUtility::template createAMGPreconditionerPointer<C>( opA, relax, milu,
comm, amg, parameters_ );
} }
/// \brief Solve the system using the given preconditioner and scalar product. /// \brief Solve the system using the given preconditioner and scalar product.
template <class Operator, class ScalarProd, class Precond> template <class Operator, class ScalarProd, class Precond>