[Cleanup] Rename: dirichletFunction -> velocityDirichletFunction

src/one-body-sample.cc

@@ -87,7 +87,8 @@ int const dims = DIM;
 
 template <class VectorType, class MatrixType, class FunctionType, int dims>
 Dune::shared_ptr<TimeSteppingScheme<VectorType, MatrixType, FunctionType, dims>>
-initTimeStepper(Config::scheme scheme, FunctionType const &dirichletFunction,
+initTimeStepper(Config::scheme scheme,
+                FunctionType const &velocityDirichletFunction,
                 Dune::BitSetVector<dims> const &ignoreNodes,
                 MatrixType const &massMatrix, MatrixType const &stiffnessMatrix,
                 VectorType const &u_initial, VectorType const &v_initial,
@@ -97,17 +98,17 @@ initTimeStepper(Config::scheme scheme, FunctionType const &dirichletFunction,
       return Dune::make_shared<
           ImplicitEuler<VectorType, MatrixType, FunctionType, dims>>(
           stiffnessMatrix, u_initial, v_initial, ignoreNodes,
-          dirichletFunction);
+          velocityDirichletFunction);
     case Config::Newmark:
       return Dune::make_shared<
           Newmark<VectorType, MatrixType, FunctionType, dims>>(
           stiffnessMatrix, massMatrix, u_initial, v_initial, a_initial,
-          ignoreNodes, dirichletFunction);
+          ignoreNodes, velocityDirichletFunction);
     case Config::EulerPair:
       return Dune::make_shared<
           EulerPair<VectorType, MatrixType, FunctionType, dims>>(
           stiffnessMatrix, massMatrix, u_initial, v_initial, ignoreNodes,
-          dirichletFunction);
+          velocityDirichletFunction);
     default:
       assert(false);
   }
@@ -247,7 +248,7 @@ int main(int argc, char *argv[]) {
     using FunctionType = Dune::VirtualFunction<double, double>;
     SharedPointerMap<std::string, FunctionType> functions;
     initPython(functions);
-    auto const &dirichletFunction = functions.get("dirichletCondition");
+    auto const &velocityDirichletFunction = functions.get("dirichletCondition");
     auto const &neumannFunction = functions.get("neumannCondition");
 
     // Set up normal stress, mass matrix, and gravity functional
@@ -350,7 +351,7 @@ int main(int argc, char *argv[]) {
       // condition match up at t=0
       v_initial = 0.0;
       double v_initial_const;
-      dirichletFunction.evaluate(0.0, v_initial_const);
+      velocityDirichletFunction.evaluate(0.0, v_initial_const);
       for (size_t i = 0; i < v_initial.size(); ++i)
         v_initial[i][0] = v_initial_const;
     }
@@ -406,7 +407,7 @@ int main(int argc, char *argv[]) {
 
     auto timeSteppingScheme =
         initTimeStepper(parset.get<Config::scheme>("timeSteppingScheme"),
-                        dirichletFunction, ignoreNodes, massMatrix,
+                        velocityDirichletFunction, ignoreNodes, massMatrix,
                         stiffnessMatrix, u_initial, v_initial, a_initial);
     auto stateUpdater = initStateUpdater<SingletonVectorType, VectorType>(
         parset.get<Config::state_model>("boundary.friction.state_model"),