diff --git a/src/assemblers.cc b/src/assemblers.cc index b0813907d04710e43a674bc4d6e354f024f8f072..d36cc9e84c37ca21bcf2b9f5ff759b8ca2786a48 100644 --- a/src/assemblers.cc +++ b/src/assemblers.cc @@ -32,8 +32,9 @@ void assembleNeumann(GridView const &gridView, AssemblerType const &assembler, // Assembles constant 1-function on frictional boundary in nodalIntegrals template <class GridView, class LocalVectorType, class AssemblerType> Dune::shared_ptr<Dune::BlockVector<Dune::FieldVector<double, 1>>> -assemble_frictional(GridView const &gridView, AssemblerType const &assembler, - Dune::BitSetVector<1> const &frictionalNodes) { +assembleFrictionWeightsal(GridView const &gridView, + AssemblerType const &assembler, + Dune::BitSetVector<1> const &frictionalNodes) { using Singleton = Dune::FieldVector<double, 1>; BoundaryPatch<GridView> const frictionalBoundary(gridView, frictionalNodes); ConstantFunction<LocalVectorType, Singleton> const constantOneFunction(1); diff --git a/src/assemblers.hh b/src/assemblers.hh index 2bef53a03ab84d3aefad6475658c997e5b61642c..b728742ec2078c3749294a7c8029e176ec03d2de 100644 --- a/src/assemblers.hh +++ b/src/assemblers.hh @@ -20,8 +20,9 @@ void assembleNeumann(GridView const &gridView, AssemblerType const &assembler, template <class GridView, class LocalVectorType, class AssemblerType> Dune::shared_ptr<Dune::BlockVector<Dune::FieldVector<double, 1>>> -assemble_frictional(GridView const &gridView, AssemblerType const &assembler, - Dune::BitSetVector<1> const &frictionalNodes); +assembleFrictionWeightsal(GridView const &gridView, + AssemblerType const &assembler, + Dune::BitSetVector<1> const &frictionalNodes); template <class MatrixType, class VectorType> Dune::shared_ptr<Dune::GlobalNonlinearity<MatrixType, VectorType>> diff --git a/src/assemblers_tmpl.cc b/src/assemblers_tmpl.cc index 9908163b1dbba6122f743e9def171a4c6c433f79..86b32abdda7f20c1e93e813db4d3f5e5c66d7545 100644 --- a/src/assemblers_tmpl.cc +++ b/src/assemblers_tmpl.cc @@ -30,7 +30,7 @@ template void assembleNeumann<GridView, SmallVector, AssemblerType>( Dune::VirtualFunction<double, double> const &neumann, double relativeTime); template Dune::shared_ptr<Dune::BlockVector<Dune::FieldVector<double, 1>>> -assemble_frictional<GridView, SmallVector, AssemblerType>( +assembleFrictionWeightsal<GridView, SmallVector, AssemblerType>( GridView const &gridView, AssemblerType const &assembler, Dune::BitSetVector<1> const &frictionalNodes); diff --git a/src/one-body-sample.cc b/src/one-body-sample.cc index 06b488d5cb1c21920c8a010f800502e52b01c152..8e913454f0fe4af9ccf215f9d818eef0a4956870 100644 --- a/src/one-body-sample.cc +++ b/src/one-body-sample.cc @@ -338,8 +338,9 @@ int main(int argc, char *argv[]) { // Q: Does it make sense to weigh them in this manner? SumNorm<VectorType> const AMNorm(1.0, ANorm, 1.0, MNorm); - auto const nodalIntegrals = assemble_frictional<GridView, SmallVector>( - leafView, p1Assembler, frictionalNodes); + auto const nodalIntegrals = + assembleFrictionWeightsal<GridView, SmallVector>(leafView, p1Assembler, + frictionalNodes); auto myGlobalNonlinearity = assembleNonlinearity<MatrixType, VectorType>( frictionalNodes, *nodalIntegrals, frictionData);