Skip to content
Snippets Groups Projects
Commit eed64f79 authored by Elias Pipping's avatar Elias Pipping Committed by Elias Pipping
Browse files

Kill superfluous parameter

parent d575c9e1
No related branches found
No related tags found
No related merge requests found
...@@ -50,7 +50,6 @@ assemble_frictional(GridView const &gridView, AssemblerType const &assembler, ...@@ -50,7 +50,6 @@ assemble_frictional(GridView const &gridView, AssemblerType const &assembler,
template <class MatrixType, class VectorType> template <class MatrixType, class VectorType>
Dune::shared_ptr<Dune::GlobalNonlinearity<MatrixType, VectorType> const> Dune::shared_ptr<Dune::GlobalNonlinearity<MatrixType, VectorType> const>
assemble_nonlinearity( assemble_nonlinearity(
Dune::ParameterTree const &parset,
Dune::BlockVector<Dune::FieldVector<double, 1>> const &nodalIntegrals, Dune::BlockVector<Dune::FieldVector<double, 1>> const &nodalIntegrals,
FrictionData const &fd, FrictionData const &fd,
Dune::BlockVector<Dune::FieldVector<double, 1>> const &state) { Dune::BlockVector<Dune::FieldVector<double, 1>> const &state) {
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
#include <dune/common/bitsetvector.hh> #include <dune/common/bitsetvector.hh>
#include <dune/common/function.hh> #include <dune/common/function.hh>
#include <dune/common/fvector.hh> #include <dune/common/fvector.hh>
#include <dune/common/parametertree.hh>
#include <dune/common/shared_ptr.hh> #include <dune/common/shared_ptr.hh>
#include <dune/istl/bvector.hh> #include <dune/istl/bvector.hh>
...@@ -27,7 +26,6 @@ assemble_frictional(GridView const &gridView, AssemblerType const &assembler, ...@@ -27,7 +26,6 @@ assemble_frictional(GridView const &gridView, AssemblerType const &assembler,
template <class MatrixType, class VectorType> template <class MatrixType, class VectorType>
Dune::shared_ptr<Dune::GlobalNonlinearity<MatrixType, VectorType> const> Dune::shared_ptr<Dune::GlobalNonlinearity<MatrixType, VectorType> const>
assemble_nonlinearity( assemble_nonlinearity(
Dune::ParameterTree const &parset,
Dune::BlockVector<Dune::FieldVector<double, 1>> const &nodalIntegrals, Dune::BlockVector<Dune::FieldVector<double, 1>> const &nodalIntegrals,
FrictionData const &fd, FrictionData const &fd,
Dune::BlockVector<Dune::FieldVector<double, 1>> const &state); Dune::BlockVector<Dune::FieldVector<double, 1>> const &state);
......
...@@ -34,7 +34,6 @@ assemble_frictional<GridView, SmallVector, AssemblerType>( ...@@ -34,7 +34,6 @@ assemble_frictional<GridView, SmallVector, AssemblerType>(
template Dune::shared_ptr< template Dune::shared_ptr<
Dune::GlobalNonlinearity<MatrixType, VectorType> const> Dune::GlobalNonlinearity<MatrixType, VectorType> const>
assemble_nonlinearity<MatrixType, VectorType>( assemble_nonlinearity<MatrixType, VectorType>(
Dune::ParameterTree const &parset,
Dune::BlockVector<Dune::FieldVector<double, 1>> const &nodalIntegrals, Dune::BlockVector<Dune::FieldVector<double, 1>> const &nodalIntegrals,
FrictionData const &fd, FrictionData const &fd,
Dune::BlockVector<Dune::FieldVector<double, 1>> const &state); Dune::BlockVector<Dune::FieldVector<double, 1>> const &state);
...@@ -408,9 +408,8 @@ int main(int argc, char *argv[]) { ...@@ -408,9 +408,8 @@ int main(int argc, char *argv[]) {
auto solveVelocityProblem = [&](VectorType &_problem_iterate, auto solveVelocityProblem = [&](VectorType &_problem_iterate,
SingletonVectorType const &_alpha) { SingletonVectorType const &_alpha) {
auto myGlobalNonlinearity = auto myGlobalNonlinearity =
assemble_nonlinearity<MatrixType, VectorType>( assemble_nonlinearity<MatrixType, VectorType>(*nodalIntegrals,
parset.sub("boundary.friction"), *nodalIntegrals, frictionData, frictionData, _alpha);
_alpha);
using MyConvexProblemType = MyConvexProblem<MatrixType, VectorType>; using MyConvexProblemType = MyConvexProblem<MatrixType, VectorType>;
MyConvexProblemType const myConvexProblem( MyConvexProblemType const myConvexProblem(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment