From 6853575798af5e2838fda6f352e1e108a03dca6f Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Thu, 29 Aug 2013 22:22:51 +0200
Subject: [PATCH] [Cleanup] Rename: assemble_neumann -> assembleNeumann
---
src/assemblers.cc | 12 ++++++------
src/assemblers.hh | 10 +++++-----
src/assemblers_tmpl.cc | 2 +-
src/one-body-sample.cc | 4 ++--
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/assemblers.cc b/src/assemblers.cc
index c3c146d6..329432a4 100644
--- a/src/assemblers.cc
+++ b/src/assemblers.cc
@@ -12,12 +12,12 @@
// Assembles Neumann boundary term in f
template <class GridView, class LocalVectorType, class AssemblerType>
-void assemble_neumann(GridView const &gridView, AssemblerType const &assembler,
- Dune::BitSetVector<1> const &neumannNodes,
- Dune::BlockVector<LocalVectorType> &f,
- Dune::VirtualFunction<double, double> const &neumann,
- double relativeTime) { // constant sample function on
- // neumann boundary
+void assembleNeumann(GridView const &gridView, AssemblerType const &assembler,
+ Dune::BitSetVector<1> const &neumannNodes,
+ Dune::BlockVector<LocalVectorType> &f,
+ Dune::VirtualFunction<double, double> const &neumann,
+ double relativeTime) { // constant sample function on
+ // neumann boundary
BoundaryPatch<GridView> const neumannBoundary(gridView, neumannNodes);
LocalVectorType SampleVector(0);
neumann.evaluate(relativeTime, SampleVector[0]);
diff --git a/src/assemblers.hh b/src/assemblers.hh
index e0a8d090..a904109b 100644
--- a/src/assemblers.hh
+++ b/src/assemblers.hh
@@ -12,11 +12,11 @@
#include <dune/tectonic/globalnonlinearity.hh>
template <class GridView, class LocalVectorType, class AssemblerType>
-void assemble_neumann(GridView const &gridView, AssemblerType const &assembler,
- Dune::BitSetVector<1> const &neumannNodes,
- Dune::BlockVector<LocalVectorType> &f,
- Dune::VirtualFunction<double, double> const &neumann,
- double relativeTime);
+void assembleNeumann(GridView const &gridView, AssemblerType const &assembler,
+ Dune::BitSetVector<1> const &neumannNodes,
+ Dune::BlockVector<LocalVectorType> &f,
+ Dune::VirtualFunction<double, double> const &neumann,
+ double relativeTime);
template <class GridView, class LocalVectorType, class AssemblerType>
Dune::shared_ptr<Dune::BlockVector<Dune::FieldVector<double, 1>>>
diff --git a/src/assemblers_tmpl.cc b/src/assemblers_tmpl.cc
index 17cedafd..231f8a47 100644
--- a/src/assemblers_tmpl.cc
+++ b/src/assemblers_tmpl.cc
@@ -23,7 +23,7 @@ using GridView = GridType::LeafGridView;
using P1Basis = P1NodalBasis<GridView, double>;
using AssemblerType = Assembler<P1Basis, P1Basis>;
-template void assemble_neumann<GridView, SmallVector, AssemblerType>(
+template void assembleNeumann<GridView, SmallVector, AssemblerType>(
GridView const &gridView, AssemblerType const &assembler,
Dune::BitSetVector<1> const &neumannNodes,
Dune::BlockVector<SmallVector> &f,
diff --git a/src/one-body-sample.cc b/src/one-body-sample.cc
index 4747485f..33f24670 100644
--- a/src/one-body-sample.cc
+++ b/src/one-body-sample.cc
@@ -345,8 +345,8 @@ int main(int argc, char *argv[]) {
// Problem formulation: right-hand side
auto const createRHS = [&](double _relativeTime, VectorType &_ell) {
- assemble_neumann(leafView, p1Assembler, neumannNodes, _ell,
- neumannFunction, _relativeTime);
+ assembleNeumann(leafView, p1Assembler, neumannNodes, _ell,
+ neumannFunction, _relativeTime);
_ell += gravityFunctional;
};
VectorType ell(finestSize);
--
GitLab