diff --git a/src/assemblers.cc b/src/assemblers.cc index c3c146d6d79485e3e899e1e42eecb63d6e11f59a..329432a4a785e1c40e36ebf9c88142333f048eaf 100644 --- a/src/assemblers.cc +++ b/src/assemblers.cc @@ -12,12 +12,12 @@ // Assembles Neumann boundary term in f template <class GridView, class LocalVectorType, class AssemblerType> -void assemble_neumann(GridView const &gridView, AssemblerType const &assembler, - Dune::BitSetVector<1> const &neumannNodes, - Dune::BlockVector<LocalVectorType> &f, - Dune::VirtualFunction<double, double> const &neumann, - double relativeTime) { // constant sample function on - // neumann boundary +void assembleNeumann(GridView const &gridView, AssemblerType const &assembler, + Dune::BitSetVector<1> const &neumannNodes, + Dune::BlockVector<LocalVectorType> &f, + Dune::VirtualFunction<double, double> const &neumann, + double relativeTime) { // constant sample function on + // neumann boundary BoundaryPatch<GridView> const neumannBoundary(gridView, neumannNodes); LocalVectorType SampleVector(0); neumann.evaluate(relativeTime, SampleVector[0]); diff --git a/src/assemblers.hh b/src/assemblers.hh index e0a8d0901d2a698bf810652bb136556842c5e5fd..a904109b0cf2da63f8f635dabd535a6feac2717f 100644 --- a/src/assemblers.hh +++ b/src/assemblers.hh @@ -12,11 +12,11 @@ #include <dune/tectonic/globalnonlinearity.hh> template <class GridView, class LocalVectorType, class AssemblerType> -void assemble_neumann(GridView const &gridView, AssemblerType const &assembler, - Dune::BitSetVector<1> const &neumannNodes, - Dune::BlockVector<LocalVectorType> &f, - Dune::VirtualFunction<double, double> const &neumann, - double relativeTime); +void assembleNeumann(GridView const &gridView, AssemblerType const &assembler, + Dune::BitSetVector<1> const &neumannNodes, + Dune::BlockVector<LocalVectorType> &f, + Dune::VirtualFunction<double, double> const &neumann, + double relativeTime); template <class GridView, class LocalVectorType, class AssemblerType> Dune::shared_ptr<Dune::BlockVector<Dune::FieldVector<double, 1>>> diff --git a/src/assemblers_tmpl.cc b/src/assemblers_tmpl.cc index 17cedafdef926f1c3be41cd0b8f08d6cea5705b8..231f8a4740ba54d7c2d5de889701de1fc2470c6b 100644 --- a/src/assemblers_tmpl.cc +++ b/src/assemblers_tmpl.cc @@ -23,7 +23,7 @@ using GridView = GridType::LeafGridView; using P1Basis = P1NodalBasis<GridView, double>; using AssemblerType = Assembler<P1Basis, P1Basis>; -template void assemble_neumann<GridView, SmallVector, AssemblerType>( +template void assembleNeumann<GridView, SmallVector, AssemblerType>( GridView const &gridView, AssemblerType const &assembler, Dune::BitSetVector<1> const &neumannNodes, Dune::BlockVector<SmallVector> &f, diff --git a/src/one-body-sample.cc b/src/one-body-sample.cc index 4747485f483853b2dbb6194169914b44cbf59add..33f246700c9da76b4d2219bb4b797db40e45c972 100644 --- a/src/one-body-sample.cc +++ b/src/one-body-sample.cc @@ -345,8 +345,8 @@ int main(int argc, char *argv[]) { // Problem formulation: right-hand side auto const createRHS = [&](double _relativeTime, VectorType &_ell) { - assemble_neumann(leafView, p1Assembler, neumannNodes, _ell, - neumannFunction, _relativeTime); + assembleNeumann(leafView, p1Assembler, neumannNodes, _ell, + neumannFunction, _relativeTime); _ell += gravityFunctional; }; VectorType ell(finestSize);