OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-09-05 04:40:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

[bugfix] recover support for selecting GMRes as solver.

Browse Source 
Previously, passing --use-gmres=true had now effect. Probably was lost
when introducing FlexibleSolver. With this change the FlexibleSolver
will now use GMRes if the option is true.

Closes #4240
This commit is contained in:
Markus Blatt
2022-11-04 20:30:13 +01:00
parent 86bbd38a55
commit 2dc73a7c47
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
opm/simulators/linalg/setupPropertyTree.cpp
+16 -4
View File
@@ -110,6 +110,18 @@ setupPropertyTree(FlowLinearSolverParameters p, // Note: copying the parameters
<< " Please use ilu0, cpr, cpr_trueimpes, cpr_quasiimpes or isai"); << " Please use ilu0, cpr, cpr_trueimpes, cpr_quasiimpes or isai");
} }
std::string getSolverString(const FlowLinearSolverParameters& p)
{
if (p.newton_use_gmres_)
{
return {"gmres"};
}
else
{
return {"bicgstab"};
}
}
PropertyTree PropertyTree
setupCPRW(const std::string& /*conf*/, const FlowLinearSolverParameters& p) setupCPRW(const std::string& /*conf*/, const FlowLinearSolverParameters& p)
{ {
@@ -118,7 +130,7 @@ setupCPRW(const std::string& /*conf*/, const FlowLinearSolverParameters& p)
prm.put("maxiter", p.linear_solver_maxiter_); prm.put("maxiter", p.linear_solver_maxiter_);
prm.put("tol", p.linear_solver_reduction_); prm.put("tol", p.linear_solver_reduction_);
prm.put("verbosity", p.linear_solver_verbosity_); prm.put("verbosity", p.linear_solver_verbosity_);
prm.put("solver", "bicgstab"s); prm.put("solver", getSolverString(p));
prm.put("preconditioner.type", "cprw"s); prm.put("preconditioner.type", "cprw"s);
prm.put("preconditioner.use_well_weights", "false"s); prm.put("preconditioner.use_well_weights", "false"s);
prm.put("preconditioner.add_wells", "true"s); prm.put("preconditioner.add_wells", "true"s);
@@ -162,7 +174,7 @@ setupCPR(const std::string& conf, const FlowLinearSolverParameters& p)
prm.put("maxiter", p.linear_solver_maxiter_); prm.put("maxiter", p.linear_solver_maxiter_);
prm.put("tol", p.linear_solver_reduction_); prm.put("tol", p.linear_solver_reduction_);
prm.put("verbosity", p.linear_solver_verbosity_); prm.put("verbosity", p.linear_solver_verbosity_);
prm.put("solver", "bicgstab"s); prm.put("solver", getSolverString(p));
prm.put("preconditioner.type", "cpr"s); prm.put("preconditioner.type", "cpr"s);
if (conf == "cpr_quasiimpes") { if (conf == "cpr_quasiimpes") {
prm.put("preconditioner.weight_type", "quasiimpes"s); prm.put("preconditioner.weight_type", "quasiimpes"s);
@@ -209,7 +221,7 @@ setupAMG([[maybe_unused]] const std::string& conf, const FlowLinearSolverParamet
prm.put("tol", p.linear_solver_reduction_); prm.put("tol", p.linear_solver_reduction_);
prm.put("maxiter", p.linear_solver_maxiter_); prm.put("maxiter", p.linear_solver_maxiter_);
prm.put("verbosity", p.linear_solver_verbosity_); prm.put("verbosity", p.linear_solver_verbosity_);
prm.put("solver", "bicgstab"s); prm.put("solver", getSolverString(p));
prm.put("preconditioner.type", "amg"s); prm.put("preconditioner.type", "amg"s);
prm.put("preconditioner.alpha", 0.333333333333); prm.put("preconditioner.alpha", 0.333333333333);
prm.put("preconditioner.relaxation", 1.0); prm.put("preconditioner.relaxation", 1.0);
@@ -243,7 +255,7 @@ setupILU([[maybe_unused]] const std::string& conf, const FlowLinearSolverParamet
prm.put("tol", p.linear_solver_reduction_); prm.put("tol", p.linear_solver_reduction_);
prm.put("maxiter", p.linear_solver_maxiter_); prm.put("maxiter", p.linear_solver_maxiter_);
prm.put("verbosity", p.linear_solver_verbosity_); prm.put("verbosity", p.linear_solver_verbosity_);
prm.put("solver", "bicgstab"s); prm.put("solver", getSolverString(p));
prm.put("preconditioner.type", "ParOverILU0"s); prm.put("preconditioner.type", "ParOverILU0"s);
prm.put("preconditioner.relaxation", p.ilu_relaxation_); prm.put("preconditioner.relaxation", p.ilu_relaxation_);
prm.put("preconditioner.ilulevel", p.ilu_fillin_level_); prm.put("preconditioner.ilulevel", p.ilu_fillin_level_);