[Cleanup] Rename: MySolver -> SolverFactory

src/Makefile.am

@@ -10,7 +10,7 @@ SOURCES = \
 	state/compute_state_dieterich_euler.cc \
 	state/compute_state_dieterich_common.cc \
 	state/compute_state_ruina.cc \
-	mysolver.cc \
+	solverfactory.cc \
 	one-body-sample.cc \
 	timestepping.cc \
 	vtk.cc

src/one-body-sample.cc

@@ -76,7 +76,7 @@
 #include <dune/tectonic/globalnonlinearity.hh>
 
 #include "assemblers.hh"
-#include "mysolver.hh"
+#include "solverfactory.hh"
 #include "vtk.hh"
 
 #include "enums.hh"
@@ -354,7 +354,7 @@ int main(int argc, char *argv[]) {
     alpha_initial =
         std::log(parset.get<double>("boundary.friction.initial_state"));
 
-    using LinearFactoryType = MySolver<
+    using LinearFactoryType = SolverFactory<
         dims, BlockNonlinearTNNMGProblem<ConvexProblem<
                   ZeroNonlinearity<SmallVector, SmallMatrix>, MatrixType>>,
         GridType>;
@@ -442,7 +442,7 @@ int main(int argc, char *argv[]) {
 
     // Set up TNNMG solver
     auto const solverTolerance = parset.get<double>("solver.tolerance");
-    using NonlinearFactoryType = MySolver<
+    using NonlinearFactoryType = SolverFactory<
         dims,
         MyBlockProblem<ConvexProblem<
             Dune::GlobalNonlinearity<MatrixType, VectorType>, MatrixType>>,

src/mysolver.cc → src/solverfactory.cc

@@ -9,10 +9,10 @@
 #include <dune/solvers/common/numproc.hh> // Solver::FULL
 #include <dune/fufem/assemblers/transferoperatorassembler.hh>
 
-#include "mysolver.hh"
+#include "solverfactory.hh"
 
 template <int dim, class BlockProblemType, class GridType>
-MySolver<dim, BlockProblemType, GridType>::MySolver(
+SolverFactory<dim, BlockProblemType, GridType>::SolverFactory(
     Dune::ParameterTree const &parset, int refinements, double solver_tolerance,
     GridType const &grid, Dune::BitSetVector<dim> const &ignoreNodes)
     : baseEnergyNorm(linearBaseSolverStep),
@@ -43,7 +43,7 @@ MySolver<dim, BlockProblemType, GridType>::MySolver(
 }
 
 template <int dim, class BlockProblemType, class GridType>
-MySolver<dim, BlockProblemType, GridType>::~MySolver() {
+SolverFactory<dim, BlockProblemType, GridType>::~SolverFactory() {
   for (auto &x : transferOperators)
     delete x;
 
@@ -51,9 +51,9 @@ MySolver<dim, BlockProblemType, GridType>::~MySolver() {
 }
 
 template <int dim, class BlockProblemType, class GridType>
-typename MySolver<dim, BlockProblemType, GridType>::SolverType *
-MySolver<dim, BlockProblemType, GridType>::getSolver() {
+typename SolverFactory<dim, BlockProblemType, GridType>::SolverType *
+SolverFactory<dim, BlockProblemType, GridType>::getSolver() {
   return multigridStep;
 }
 
-#include "mysolver_tmpl.cc"
+#include "solverfactory_tmpl.cc"

src/mysolver.hh → src/solverfactory.hh

-#ifndef MYSOLVER_HH
-#define MYSOLVER_HH
+#ifndef SOLVER_FACTORY_HH
+#define SOLVER_FACTORY_HH
 
 #include <dune/common/bitsetvector.hh>
 #include <dune/common/parametertree.hh>
@@ -13,7 +13,7 @@
 #include <dune/tnnmg/iterationsteps/tnnmgstep.hh>
 
 template <int dim, class BlockProblemTypeTEMPLATE, class GridType>
-class MySolver {
+class SolverFactory {
 public:
   using BlockProblemType = BlockProblemTypeTEMPLATE;
   using ConvexProblemType = typename BlockProblemType::ConvexProblemType;
@@ -26,11 +26,11 @@ class MySolver {
                                                        NonlinearSmootherType>;
 
 public:
-  MySolver(Dune::ParameterTree const &parset, int refinements,
-           double solver_tolerance, GridType const &grid,
-           Dune::BitSetVector<dim> const &ignoreNodes);
+  SolverFactory(Dune::ParameterTree const &parset, int refinements,
+                double solver_tolerance, GridType const &grid,
+                Dune::BitSetVector<dim> const &ignoreNodes);
 
-  ~MySolver();
+  ~SolverFactory();
 
   SolverType *getSolver();
 

src/mysolver_tmpl.cc → src/solverfactory_tmpl.cc

@@ -27,11 +27,11 @@ using MatrixType = Dune::BCRSMatrix<SmallMatrix>;
 
 using GridType = Dune::ALUGrid<DIM, DIM, Dune::simplex, Dune::nonconforming>;
 
-template class MySolver<
+template class SolverFactory<
     DIM, MyBlockProblem<ConvexProblem<
              Dune::GlobalNonlinearity<MatrixType, VectorType>, MatrixType>>,
     GridType>;
-template class MySolver<
+template class SolverFactory<
     DIM, BlockNonlinearTNNMGProblem<ConvexProblem<
              ZeroNonlinearity<SmallVector, SmallMatrix>, MatrixType>>,
     GridType>;