From 84bf024161b98060e4915bace37357d76ebedd02 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Thu, 29 Aug 2013 22:34:59 +0200
Subject: [PATCH] [Cleanup] Rename: assemble_nonlinearity ->
assembleNonlinearity
---
src/assemblers.cc | 2 +-
src/assemblers.hh | 2 +-
src/assemblers_tmpl.cc | 2 +-
src/one-body-sample.cc | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/assemblers.cc b/src/assemblers.cc
index 329432a4..b0813907 100644
--- a/src/assemblers.cc
+++ b/src/assemblers.cc
@@ -48,7 +48,7 @@ assemble_frictional(GridView const &gridView, AssemblerType const &assembler,
template <class MatrixType, class VectorType>
Dune::shared_ptr<Dune::GlobalNonlinearity<MatrixType, VectorType>>
-assemble_nonlinearity(
+assembleNonlinearity(
Dune::BitSetVector<1> const &frictionalNodes,
Dune::BlockVector<Dune::FieldVector<double, 1>> const &nodalIntegrals,
FrictionData const &fd) {
diff --git a/src/assemblers.hh b/src/assemblers.hh
index a904109b..2bef53a0 100644
--- a/src/assemblers.hh
+++ b/src/assemblers.hh
@@ -25,7 +25,7 @@ assemble_frictional(GridView const &gridView, AssemblerType const &assembler,
template <class MatrixType, class VectorType>
Dune::shared_ptr<Dune::GlobalNonlinearity<MatrixType, VectorType>>
-assemble_nonlinearity(
+assembleNonlinearity(
Dune::BitSetVector<1> const &frictionalNodes,
Dune::BlockVector<Dune::FieldVector<double, 1>> const &nodalIntegrals,
FrictionData const &fd);
diff --git a/src/assemblers_tmpl.cc b/src/assemblers_tmpl.cc
index 231f8a47..9908163b 100644
--- a/src/assemblers_tmpl.cc
+++ b/src/assemblers_tmpl.cc
@@ -35,7 +35,7 @@ assemble_frictional<GridView, SmallVector, AssemblerType>(
Dune::BitSetVector<1> const &frictionalNodes);
template Dune::shared_ptr<Dune::GlobalNonlinearity<MatrixType, VectorType>>
-assemble_nonlinearity<MatrixType, VectorType>(
+assembleNonlinearity<MatrixType, VectorType>(
Dune::BitSetVector<1> const &frictionalNodes,
Dune::BlockVector<Dune::FieldVector<double, 1>> const &nodalIntegrals,
FrictionData const &fd);
diff --git a/src/one-body-sample.cc b/src/one-body-sample.cc
index 33f24670..06b488d5 100644
--- a/src/one-body-sample.cc
+++ b/src/one-body-sample.cc
@@ -340,7 +340,7 @@ int main(int argc, char *argv[]) {
auto const nodalIntegrals = assemble_frictional<GridView, SmallVector>(
leafView, p1Assembler, frictionalNodes);
- auto myGlobalNonlinearity = assemble_nonlinearity<MatrixType, VectorType>(
+ auto myGlobalNonlinearity = assembleNonlinearity<MatrixType, VectorType>(
frictionalNodes, *nodalIntegrals, frictionData);
// Problem formulation: right-hand side
--
GitLab