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

CPR: FastAMG seems not to be faster, so use regular AMG.

Browse Source
This commit is contained in:
Robert Kloefkorn 2015-03-31 12:42:58 +02:00
parent adac4a7995
commit 632bc7a809
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
opm/autodiff/CPRPreconditioner.hpp
View File

@ -97,7 +97,9 @@ struct CPRSelector
typedef std::unique_ptr<EllipticPreconditioner> EllipticPreconditionerPointer; typedef std::unique_ptr<EllipticPreconditioner> EllipticPreconditionerPointer;
/// \brief type of AMG used to precondition the elliptic system. /// \brief type of AMG used to precondition the elliptic system.
typedef Dune::Amg::FastAMG<Operator, X> AMG; typedef EllipticPreconditioner Smoother;
typedef Dune::Amg::AMG<Operator, X, Smoother, ParallelInformation> AMG;
//typedef Dune::Amg::FastAMG<Operator, X> AMG;
/// \brief creates an Operator from the matrix /// \brief creates an Operator from the matrix
/// \param M The matrix to use. /// \param M The matrix to use.
@ -347,10 +349,6 @@ createEllipticPreconditionerPointer(const M& Ae, double relax,
//! \brief preconditioner for the whole system (here either ILU(0) or ILU(n) //! \brief preconditioner for the whole system (here either ILU(0) or ILU(n)
typedef Dune::Preconditioner<X,X> WholeSystemPreconditioner; typedef Dune::Preconditioner<X,X> WholeSystemPreconditioner;
//! \brief the ilu-0 preconditioner used the for the elliptic system
typedef typename CPRSelector<M,X,X,P>::EllipticPreconditioner
EllipticPreconditioner;
//! \brief type of the unique pointer to the ilu-0 preconditioner //! \brief type of the unique pointer to the ilu-0 preconditioner
//! used the for the elliptic system //! used the for the elliptic system
typedef typename CPRSelector<M,X,X,P>::EllipticPreconditionerPointer typedef typename CPRSelector<M,X,X,P>::EllipticPreconditionerPointer
@ -540,23 +538,20 @@ createEllipticPreconditionerPointer(const M& Ae, double relax,
{ {
if( amg ) if( amg )
{ {
//! \brief The coupling metric used in the AMG // The coupling metric used in the AMG
typedef Dune::Amg::FirstDiagonal CouplingMetric; typedef Dune::Amg::FirstDiagonal CouplingMetric;
//! \brief The coupling criterion used in the AMG // The coupling criterion used in the AMG
typedef Dune::Amg::SymmetricCriterion<M, CouplingMetric> CritBase; typedef Dune::Amg::SymmetricCriterion<M, CouplingMetric> CritBase;
//! \brief The coarsening criterion used in the AMG // The coarsening criterion used in the AMG
typedef Dune::Amg::CoarsenCriterion<CritBase> Criterion; typedef Dune::Amg::CoarsenCriterion<CritBase> Criterion;
// TODO: revise choice of parameters
int coarsenTarget=1200; int coarsenTarget=1200;
Criterion criterion(15,coarsenTarget); Criterion criterion(15,coarsenTarget);
criterion.setDebugLevel( 0 ); // no debug information, 1 for printing hierarchy information criterion.setDebugLevel( 0 ); // no debug information, 1 for printing hierarchy information
criterion.setDefaultValuesIsotropic(2); criterion.setDefaultValuesIsotropic(2);
//criterion.setAlpha(.67);
//criterion.setGamma(1);
//criterion.setBeta(1.0e-6);
//criterion.setMaxLevel(10);
criterion.setNoPostSmoothSteps( 1 ); criterion.setNoPostSmoothSteps( 1 );
criterion.setNoPreSmoothSteps( 1 ); criterion.setNoPreSmoothSteps( 1 );
amg_ = std::unique_ptr< AMG > (new AMG(*opAe_, criterion));//, smootherArgs)); amg_ = std::unique_ptr< AMG > (new AMG(*opAe_, criterion));//, smootherArgs));