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

[Cleanup] Rename: assemble_nonlinearity -> assembleNonlinearity

parent 68535757
Branches
No related tags found
No related merge requests found
...@@ -48,7 +48,7 @@ assemble_frictional(GridView const &gridView, AssemblerType const &assembler, ...@@ -48,7 +48,7 @@ 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>> Dune::shared_ptr<Dune::GlobalNonlinearity<MatrixType, VectorType>>
assemble_nonlinearity( assembleNonlinearity(
Dune::BitSetVector<1> const &frictionalNodes, Dune::BitSetVector<1> const &frictionalNodes,
Dune::BlockVector<Dune::FieldVector<double, 1>> const &nodalIntegrals, Dune::BlockVector<Dune::FieldVector<double, 1>> const &nodalIntegrals,
FrictionData const &fd) { FrictionData const &fd) {
......
...@@ -25,7 +25,7 @@ assemble_frictional(GridView const &gridView, AssemblerType const &assembler, ...@@ -25,7 +25,7 @@ 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>> Dune::shared_ptr<Dune::GlobalNonlinearity<MatrixType, VectorType>>
assemble_nonlinearity( assembleNonlinearity(
Dune::BitSetVector<1> const &frictionalNodes, Dune::BitSetVector<1> const &frictionalNodes,
Dune::BlockVector<Dune::FieldVector<double, 1>> const &nodalIntegrals, Dune::BlockVector<Dune::FieldVector<double, 1>> const &nodalIntegrals,
FrictionData const &fd); FrictionData const &fd);
......
...@@ -35,7 +35,7 @@ assemble_frictional<GridView, SmallVector, AssemblerType>( ...@@ -35,7 +35,7 @@ assemble_frictional<GridView, SmallVector, AssemblerType>(
Dune::BitSetVector<1> const &frictionalNodes); Dune::BitSetVector<1> const &frictionalNodes);
template Dune::shared_ptr<Dune::GlobalNonlinearity<MatrixType, VectorType>> template Dune::shared_ptr<Dune::GlobalNonlinearity<MatrixType, VectorType>>
assemble_nonlinearity<MatrixType, VectorType>( assembleNonlinearity<MatrixType, VectorType>(
Dune::BitSetVector<1> const &frictionalNodes, Dune::BitSetVector<1> const &frictionalNodes,
Dune::BlockVector<Dune::FieldVector<double, 1>> const &nodalIntegrals, Dune::BlockVector<Dune::FieldVector<double, 1>> const &nodalIntegrals,
FrictionData const &fd); FrictionData const &fd);
...@@ -340,7 +340,7 @@ int main(int argc, char *argv[]) { ...@@ -340,7 +340,7 @@ int main(int argc, char *argv[]) {
auto const nodalIntegrals = assemble_frictional<GridView, SmallVector>( auto const nodalIntegrals = assemble_frictional<GridView, SmallVector>(
leafView, p1Assembler, frictionalNodes); leafView, p1Assembler, frictionalNodes);
auto myGlobalNonlinearity = assemble_nonlinearity<MatrixType, VectorType>( auto myGlobalNonlinearity = assembleNonlinearity<MatrixType, VectorType>(
frictionalNodes, *nodalIntegrals, frictionData); frictionalNodes, *nodalIntegrals, frictionData);
// Problem formulation: right-hand side // Problem formulation: right-hand side
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment