Rename parameters that control the multigrid

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;
 }
 

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