From ae42a57371f9fa8f9122b0abed2928c5544625cd Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Mon, 14 Jan 2013 14:44:58 +0100
Subject: [PATCH] Rename parameters that control the multigrid
---
src/mysolver.cc | 12 ++++++------
src/one-body-sample.parset | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/mysolver.cc b/src/mysolver.cc
index 81498586..63263476 100644
--- a/src/mysolver.cc
+++ b/src/mysolver.cc
@@ -22,9 +22,9 @@ MySolver<dim, MatrixType, VectorType, GridType, BlockProblemType>::MySolver(
transferOperators(refinements),
multigridStep(new SolverType(linearIterationStep, nonlinearSmoother)) {
// linear iteration step
- linearIterationStep.setMGType(parset.get<int>("linear.mu"),
- parset.get<int>("linear.nu1"),
- parset.get<int>("linear.nu2"));
+ linearIterationStep.setMGType(parset.get<int>("linear.cycle"),
+ parset.get<int>("linear.pre"),
+ parset.get<int>("linear.post"));
linearIterationStep.basesolver_ = &linearBaseSolver;
linearIterationStep.setSmoother(&linearPresmoother, &linearPostsmoother);
@@ -36,9 +36,9 @@ MySolver<dim, MatrixType, VectorType, GridType, BlockProblemType>::MySolver(
linearIterationStep.setTransferOperators(transferOperators);
// tnnmg iteration step
- multigridStep->setSmoothingSteps(parset.get<int>("main.nu1"),
- parset.get<int>("main.mu"),
- parset.get<int>("main.nu2"));
+ multigridStep->setSmoothingSteps(parset.get<int>("main.pre"),
+ parset.get<int>("main.multi"),
+ parset.get<int>("main.post"));
multigridStep->ignoreNodes_ = &ignoreNodes;
}
diff --git a/src/one-body-sample.parset b/src/one-body-sample.parset
index 94d982ac..1e1e9ff2 100644
--- a/src/one-body-sample.parset
+++ b/src/one-body-sample.parset
@@ -31,14 +31,14 @@ fixed_point_tolerance = 1e-10
[solver.tnnmg.linear]
maxiterations = 1000000
-nu1 = 1
-mu = 1
-nu2 = 1
+pre = 1
+cycle = 1 # 1 = V, 2 = W, etc.
+post = 1
[solver.tnnmg.main]
-nu1 = 1
-mu = 4
-nu2 = 0 # Krause modification; old: 1
+pre = 1
+multi = 4 # number of multigrid steps
+post = 0
[localsolver]
steps = 1
--
GitLab