From 77111688c1853cc708a98cca08b05d53f606af51 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Thu, 29 Aug 2013 22:36:44 +0200
Subject: [PATCH] [Cleanup] Rename: assemble_frictional ->
assembleFrictionWeights
---
src/assemblers.cc | 5 +++--
src/assemblers.hh | 5 +++--
src/assemblers_tmpl.cc | 2 +-
src/one-body-sample.cc | 5 +++--
4 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/assemblers.cc b/src/assemblers.cc
index b0813907..d36cc9e8 100644
--- a/src/assemblers.cc
+++ b/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);
diff --git a/src/assemblers.hh b/src/assemblers.hh
index 2bef53a0..b728742e 100644
--- a/src/assemblers.hh
+++ b/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>>
diff --git a/src/assemblers_tmpl.cc b/src/assemblers_tmpl.cc
index 9908163b..86b32abd 100644
--- a/src/assemblers_tmpl.cc
+++ b/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);
diff --git a/src/one-body-sample.cc b/src/one-body-sample.cc
index 06b488d5..8e913454 100644
--- a/src/one-body-sample.cc
+++ b/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);
--
GitLab