diff --git a/src/assemblers.cc b/src/assemblers.cc index 329432a4a785e1c40e36ebf9c88142333f048eaf..b0813907d04710e43a674bc4d6e354f024f8f072 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 a904109b0cf2da63f8f635dabd535a6feac2717f..2bef53a03ab84d3aefad6475658c997e5b61642c 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 231f8a4740ba54d7c2d5de889701de1fc2470c6b..9908163b1dbba6122f743e9def171a4c6c433f79 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 33f246700c9da76b4d2219bb4b797db40e45c972..06b488d5cb1c21920c8a010f800502e52b01c152 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