From eed64f79561d46244fa740ed0e47a0b9aba7b526 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Sat, 1 Jun 2013 19:44:17 +0200
Subject: [PATCH] Kill superfluous parameter
---
src/assemblers.cc | 1 -
src/assemblers.hh | 2 --
src/assemblers_tmpl.cc | 1 -
src/one-body-sample.cc | 5 ++---
4 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/assemblers.cc b/src/assemblers.cc
index 49539136..3f605f38 100644
--- a/src/assemblers.cc
+++ b/src/assemblers.cc
@@ -50,7 +50,6 @@ assemble_frictional(GridView const &gridView, AssemblerType const &assembler,
template <class MatrixType, class VectorType>
Dune::shared_ptr<Dune::GlobalNonlinearity<MatrixType, VectorType> const>
assemble_nonlinearity(
- Dune::ParameterTree const &parset,
Dune::BlockVector<Dune::FieldVector<double, 1>> const &nodalIntegrals,
FrictionData const &fd,
Dune::BlockVector<Dune::FieldVector<double, 1>> const &state) {
diff --git a/src/assemblers.hh b/src/assemblers.hh
index 5f5f27ea..f7463260 100644
--- a/src/assemblers.hh
+++ b/src/assemblers.hh
@@ -4,7 +4,6 @@
#include <dune/common/bitsetvector.hh>
#include <dune/common/function.hh>
#include <dune/common/fvector.hh>
-#include <dune/common/parametertree.hh>
#include <dune/common/shared_ptr.hh>
#include <dune/istl/bvector.hh>
@@ -27,7 +26,6 @@ assemble_frictional(GridView const &gridView, AssemblerType const &assembler,
template <class MatrixType, class VectorType>
Dune::shared_ptr<Dune::GlobalNonlinearity<MatrixType, VectorType> const>
assemble_nonlinearity(
- Dune::ParameterTree const &parset,
Dune::BlockVector<Dune::FieldVector<double, 1>> const &nodalIntegrals,
FrictionData const &fd,
Dune::BlockVector<Dune::FieldVector<double, 1>> const &state);
diff --git a/src/assemblers_tmpl.cc b/src/assemblers_tmpl.cc
index 9faff8eb..e9ac6824 100644
--- a/src/assemblers_tmpl.cc
+++ b/src/assemblers_tmpl.cc
@@ -34,7 +34,6 @@ assemble_frictional<GridView, SmallVector, AssemblerType>(
template Dune::shared_ptr<
Dune::GlobalNonlinearity<MatrixType, VectorType> const>
assemble_nonlinearity<MatrixType, VectorType>(
- Dune::ParameterTree const &parset,
Dune::BlockVector<Dune::FieldVector<double, 1>> const &nodalIntegrals,
FrictionData const &fd,
Dune::BlockVector<Dune::FieldVector<double, 1>> const &state);
diff --git a/src/one-body-sample.cc b/src/one-body-sample.cc
index ae0a0e4e..9bb48e0e 100644
--- a/src/one-body-sample.cc
+++ b/src/one-body-sample.cc
@@ -408,9 +408,8 @@ int main(int argc, char *argv[]) {
auto solveVelocityProblem = [&](VectorType &_problem_iterate,
SingletonVectorType const &_alpha) {
auto myGlobalNonlinearity =
- assemble_nonlinearity<MatrixType, VectorType>(
- parset.sub("boundary.friction"), *nodalIntegrals, frictionData,
- _alpha);
+ assemble_nonlinearity<MatrixType, VectorType>(*nodalIntegrals,
+ frictionData, _alpha);
using MyConvexProblemType = MyConvexProblem<MatrixType, VectorType>;
MyConvexProblemType const myConvexProblem(
--
GitLab