Skip to content
Snippets Groups Projects
Commit bb7614ca authored by Max Kahnt's avatar Max Kahnt
Browse files

Refactor GSStepTest.

parent 0ed01bb0
No related branches found
No related tags found
No related merge requests found
Pipeline #
...@@ -71,66 +71,44 @@ struct GSTestSuite ...@@ -71,66 +71,44 @@ struct GSTestSuite
using Vector = typename Problem::Vector; using Vector = typename Problem::Vector;
Analyser<Vector> analyser(p.u_ex, p.energyNorm, solveTol); Analyser<Vector> analyser(p.u_ex, p.energyNorm, solveTol);
{
Vector u_copy = p.u;
Vector rhs_copy = p.rhs;
using GSStep = BlockGSStep<Matrix, Vector>; using LoopSolver = ::LoopSolver<Vector>;
GSStep gsStep; using Step = LinearIterationStep<Matrix, Vector>;
gsStep.setProblem(p.A, u_copy, rhs_copy);
typename GSStep::BitVector ignore(u_copy.size(), false);
gsStep.ignoreNodes_ = &ignore;
::LoopSolver<typename Problem::Vector> solver( auto test = [&](Step* step, std::string name) {
&gsStep, maxIterations, stepTol, &p.energyNorm, verbosity,
relativeErrors);
solver.check();
solver.preprocess();
solver.solve();
passed = passed and analyser.analyse(u_copy, "BlockGS");
}
{
Vector u_copy = p.u; Vector u_copy = p.u;
Vector rhs_copy = p.rhs; Vector rhs_copy = p.rhs;
using GSStep = SemiDefiniteBlockGSStep<Matrix, Vector>; step->setProblem(p.A, u_copy, rhs_copy);
GSStep gsStep; typename Step::BitVector ignore(u_copy.size(), false);
gsStep.setProblem(p.A, u_copy, rhs_copy); step->ignoreNodes_ = &ignore;
typename GSStep::BitVector ignore(u_copy.size(), false);
gsStep.ignoreNodes_ = &ignore;
::LoopSolver<typename Problem::Vector> solver( LoopSolver solver(step, maxIterations, stepTol,
&gsStep, maxIterations, stepTol, &p.energyNorm, verbosity, &p.energyNorm, verbosity, relativeErrors);
relativeErrors);
solver.check(); solver.check();
solver.preprocess(); solver.preprocess();
solver.solve(); solver.solve();
passed = passed and analyser.analyse(u_copy, "SemiDefiniteBlockGS"); passed = passed and analyser.analyse(u_copy, name);
} };
{ {
Vector u_copy = p.u; BlockGSStep<Matrix, Vector> gsStep;
Vector rhs_copy = p.rhs; test(&gsStep, "BlockGS");
}
using GSStep = SemiDefiniteBlockGSStep<Matrix, Vector>; for(auto reg : {false, true}) {
for(auto type : {"direct", "ldlt", "cg"}) {
Dune::ParameterTree config; Dune::ParameterTree config;
config["regularize_diagonal"] = "true"; config["type"] = type;
config["regularize_diagonal"] = reg ? "1" : "0";
GSStep gsStep;
gsStep.setProblem(p.A, u_copy, rhs_copy);
typename GSStep::BitVector ignore(u_copy.size(), false);
gsStep.ignoreNodes_ = &ignore;
::LoopSolver<typename Problem::Vector> solver( SemiDefiniteBlockGSStep<Matrix, Vector> gsStep(config);
&gsStep, maxIterations, stepTol, &p.energyNorm, verbosity, test(&gsStep, Dune::formatString("SemiDefiniteBlockGS %s %s",
relativeErrors); type, reg ? "regularized" : ""));
solver.check();
solver.preprocess();
solver.solve();
passed = passed and analyser.analyse(u_copy, "SemiDefiniteBlockGS regularized");
} }
}
return passed; return passed;
} }
}; };
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment