OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-23 16:00:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

Finished customizability in terms of steps and prolongateFactor

Browse Source
This commit is contained in:
Markus Blatt 2013-01-18 14:11:59 +01:00
parent 0baa40fb88
commit c48234c0e4
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
opm/core/linalg/LinearSolverIstl.cpp
View File

@ -59,7 +59,8 @@ namespace Opm
solveCG_ILU0(const Mat& A, Vector& x, Vector& b, double tolerance, int maxit, int verbosity); solveCG_ILU0(const Mat& A, Vector& x, Vector& b, double tolerance, int maxit, int verbosity);
LinearSolverInterface::LinearSolverReport LinearSolverInterface::LinearSolverReport
solveCG_AMG(const Mat& A, Vector& x, Vector& b, double tolerance, int maxit, int verbosity); solveCG_AMG(const Mat& A, Vector& x, Vector& b, double tolerance, int maxit, int verbosity,
double prolongateFactor, int smothsteps);
LinearSolverInterface::LinearSolverReport LinearSolverInterface::LinearSolverReport
solveBiCGStab_ILU0(const Mat& A, Vector& x, Vector& b, double tolerance, int maxit, int verbosity); solveBiCGStab_ILU0(const Mat& A, Vector& x, Vector& b, double tolerance, int maxit, int verbosity);
@ -100,7 +101,7 @@ namespace Opm
} }
linsolver_max_iterations_ = param.getDefault("linsolver_max_iterations", linsolver_max_iterations_); linsolver_max_iterations_ = param.getDefault("linsolver_max_iterations", linsolver_max_iterations_);
linsolver_smooth_steps_ = param.getDefault("linsolver_smooth_steps", linsolver_smooth_steps_); linsolver_smooth_steps_ = param.getDefault("linsolver_smooth_steps", linsolver_smooth_steps_);
linsolver_prolongate_factor_ = param.getDegfault("linsolver_prolongate_factor", linsolver_prolongate_factor_); linsolver_prolongate_factor_ = param.getDefault("linsolver_prolongate_factor", linsolver_prolongate_factor_);
} }
@ -167,7 +168,8 @@ namespace Opm
res = solveCG_ILU0(A, x, b, linsolver_residual_tolerance_, maxit, linsolver_verbosity_); res = solveCG_ILU0(A, x, b, linsolver_residual_tolerance_, maxit, linsolver_verbosity_);
break; break;
case CG_AMG: case CG_AMG:
res = solveCG_AMG(A, x, b, linsolver_residual_tolerance_, maxit, linsolver_verbosity_); res = solveCG_AMG(A, x, b, linsolver_residual_tolerance_, maxit, linsolver_verbosity_,
linsolver_prolongate_factor_, linsolver_smooth_steps_);
break; break;
case BiCGStab_ILU0: case BiCGStab_ILU0:
res = solveBiCGStab_ILU0(A, x, b, linsolver_residual_tolerance_, maxit, linsolver_verbosity_); res = solveBiCGStab_ILU0(A, x, b, linsolver_residual_tolerance_, maxit, linsolver_verbosity_);
@ -222,7 +224,7 @@ namespace Opm
LinearSolverInterface::LinearSolverReport LinearSolverInterface::LinearSolverReport
solveCG_AMG(const Mat& A, Vector& x, Vector& b, double tolerance, int maxit, int verbosity) solveCG_AMG(const Mat& A, Vector& x, Vector& b, double tolerance, int maxit, int verbosity, double linsolver_prolongate_factor, int linsolver_smooth_steps)
{ {
// Solve with AMG solver. // Solve with AMG solver.
#define FIRST_DIAGONAL 1 #define FIRST_DIAGONAL 1
@ -261,9 +263,9 @@ namespace Opm
#if ANISOTROPIC_3D #if ANISOTROPIC_3D
criterion.setDefaultValuesAnisotropic(3, 2); criterion.setDefaultValuesAnisotropic(3, 2);
#endif #endif
criterion.setProlongateDampingFactor(linsolve_prolongate_factor_); criterion.setProlongationDampingFactor(linsolver_prolongate_factor);
Precond precond(opA, criterion, smootherArgs, 1, linsolve_smooth_steps_, Precond precond(opA, criterion, smootherArgs, 1, linsolver_smooth_steps,
linsolve_smooth_steps_); linsolver_smooth_steps);
// Construct linear solver. // Construct linear solver.
CGSolver<Vector> linsolve(opA, precond, tolerance, maxit, verbosity); CGSolver<Vector> linsolve(opA, precond, tolerance, maxit, verbosity);

2
opm/core/linalg/LinearSolverIstl.hpp
View File

@ -91,7 +91,7 @@ namespace Opm
/** \brief The number smoothing steps to apply in AMG. */ /** \brief The number smoothing steps to apply in AMG. */
int linsolver_smooth_steps_; int linsolver_smooth_steps_;
/** \brief The factor to scale the coarse grid correction with. */ /** \brief The factor to scale the coarse grid correction with. */
linsolver_prolongate_factor_; double linsolver_prolongate_factor_;
}; };