[Cleanup] Rename: assemble_frictional -> assembleFrictionWeights

src/assemblers.cc

@@ -32,8 +32,9 @@ void assembleNeumann(GridView const &gridView, AssemblerType const &assembler,
 // Assembles constant 1-function on frictional boundary in nodalIntegrals
 template <class GridView, class LocalVectorType, class AssemblerType>
 Dune::shared_ptr<Dune::BlockVector<Dune::FieldVector<double, 1>>>
-assemble_frictional(GridView const &gridView, AssemblerType const &assembler,
-                    Dune::BitSetVector<1> const &frictionalNodes) {
+assembleFrictionWeightsal(GridView const &gridView,
+                          AssemblerType const &assembler,
+                          Dune::BitSetVector<1> const &frictionalNodes) {
   using Singleton = Dune::FieldVector<double, 1>;
   BoundaryPatch<GridView> const frictionalBoundary(gridView, frictionalNodes);
   ConstantFunction<LocalVectorType, Singleton> const constantOneFunction(1);

src/assemblers.hh

@@ -20,8 +20,9 @@ void assembleNeumann(GridView const &gridView, AssemblerType const &assembler,
 
 template <class GridView, class LocalVectorType, class AssemblerType>
 Dune::shared_ptr<Dune::BlockVector<Dune::FieldVector<double, 1>>>
-assemble_frictional(GridView const &gridView, AssemblerType const &assembler,
-                    Dune::BitSetVector<1> const &frictionalNodes);
+assembleFrictionWeightsal(GridView const &gridView,
+                          AssemblerType const &assembler,
+                          Dune::BitSetVector<1> const &frictionalNodes);
 
 template <class MatrixType, class VectorType>
 Dune::shared_ptr<Dune::GlobalNonlinearity<MatrixType, VectorType>>

src/assemblers_tmpl.cc

@@ -30,7 +30,7 @@ template void assembleNeumann<GridView, SmallVector, AssemblerType>(
     Dune::VirtualFunction<double, double> const &neumann, double relativeTime);
 
 template Dune::shared_ptr<Dune::BlockVector<Dune::FieldVector<double, 1>>>
-assemble_frictional<GridView, SmallVector, AssemblerType>(
+assembleFrictionWeightsal<GridView, SmallVector, AssemblerType>(
     GridView const &gridView, AssemblerType const &assembler,
     Dune::BitSetVector<1> const &frictionalNodes);
 

src/one-body-sample.cc

@@ -338,8 +338,9 @@ int main(int argc, char *argv[]) {
     // Q: Does it make sense to weigh them in this manner?
     SumNorm<VectorType> const AMNorm(1.0, ANorm, 1.0, MNorm);
 
-    auto const nodalIntegrals = assemble_frictional<GridView, SmallVector>(
-        leafView, p1Assembler, frictionalNodes);
+    auto const nodalIntegrals =
+        assembleFrictionWeightsal<GridView, SmallVector>(leafView, p1Assembler,
+                                                         frictionalNodes);
     auto myGlobalNonlinearity = assembleNonlinearity<MatrixType, VectorType>(
         frictionalNodes, *nodalIntegrals, frictionData);