[Cleanup] multigridStep: Rename: Solver -> Step

src/fixedpointiterator.cc

@@ -38,7 +38,7 @@ FixedPointIterator<Factory, StateUpdater, VelocityUpdater, ErrorNorm>::run(
     std::shared_ptr<VelocityUpdater> velocityUpdater,
     Matrix const &velocityMatrix, Vector const &velocityRHS,
     Vector &velocityIterate) {
-  auto multigridStep = factory_.getSolver();
+  auto multigridStep = factory_.getStep();
 
   EnergyNorm<Matrix, Vector> energyNorm(velocityMatrix);
   LoopSolver<Vector> velocityProblemSolver(

src/sand-wedge.cc

@@ -235,7 +235,7 @@ int main(int argc, char *argv[]) {
           1.0, _matrix, zeroNonlinearity, _rhs, _x);
       typename LinearFactory::BlockProblem problem(parset, convexProblem);
 
-      auto multigridStep = factory.getSolver();
+      auto multigridStep = factory.getStep();
       multigridStep->setProblem(_x, problem);
       LoopSolver<Vector> solver(
           multigridStep.get(), _localParset.get<size_t>("maximumIterations"),

src/solverfactory.cc

@@ -22,7 +22,7 @@ SolverFactory<dim, BlockProblem, Grid>::SolverFactory(
                        Solver::QUIET),
       transferOperators(refinements),
       multigridStep(
-          std::make_shared<Solver>(linearIterationStep, nonlinearSmoother)) {
+          std::make_shared<Step>(linearIterationStep, nonlinearSmoother)) {
   // linear iteration step
   linearIterationStep.setMGType(parset.get<int>("linear.cycle"),
                                 parset.get<int>("linear.pre"),
@@ -51,8 +51,8 @@ SolverFactory<dim, BlockProblem, Grid>::~SolverFactory() {
 }
 
 template <size_t dim, class BlockProblem, class Grid>
-auto SolverFactory<dim, BlockProblem, Grid>::getSolver()
-    -> std::shared_ptr<Solver> {
+auto SolverFactory<dim, BlockProblem, Grid>::getStep()
+    -> std::shared_ptr<Step> {
   return multigridStep;
 }
 

src/solverfactory.hh

@@ -26,7 +26,7 @@ class SolverFactory {
 
 private:
   using NonlinearSmoother = GenericNonlinearGS<BlockProblem>;
-  using Solver =
+  using Step =
       TruncatedNonsmoothNewtonMultigrid<BlockProblem, NonlinearSmoother>;
 
 public:
@@ -35,7 +35,7 @@ class SolverFactory {
 
   ~SolverFactory();
 
-  std::shared_ptr<Solver> getSolver();
+  std::shared_ptr<Step> getStep();
 
 private:
   TruncatedBlockGSStep<Matrix, Vector> linearBaseSolverStep;
@@ -46,6 +46,6 @@ class SolverFactory {
   MultigridStep<Matrix, Vector> linearIterationStep;
   std::vector<CompressedMultigridTransfer<Vector> *> transferOperators;
   NonlinearSmoother nonlinearSmoother;
-  std::shared_ptr<Solver> multigridStep;
+  std::shared_ptr<Step> multigridStep;
 };
 #endif