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

[Cleanup] Rename: assemble_neumann -> assembleNeumann

parent 9fa425bc
No related branches found
No related tags found
No related merge requests found
...@@ -12,12 +12,12 @@ ...@@ -12,12 +12,12 @@
// Assembles Neumann boundary term in f // Assembles Neumann boundary term in f
template <class GridView, class LocalVectorType, class AssemblerType> template <class GridView, class LocalVectorType, class AssemblerType>
void assemble_neumann(GridView const &gridView, AssemblerType const &assembler, void assembleNeumann(GridView const &gridView, AssemblerType const &assembler,
Dune::BitSetVector<1> const &neumannNodes, Dune::BitSetVector<1> const &neumannNodes,
Dune::BlockVector<LocalVectorType> &f, Dune::BlockVector<LocalVectorType> &f,
Dune::VirtualFunction<double, double> const &neumann, Dune::VirtualFunction<double, double> const &neumann,
double relativeTime) { // constant sample function on double relativeTime) { // constant sample function on
// neumann boundary // neumann boundary
BoundaryPatch<GridView> const neumannBoundary(gridView, neumannNodes); BoundaryPatch<GridView> const neumannBoundary(gridView, neumannNodes);
LocalVectorType SampleVector(0); LocalVectorType SampleVector(0);
neumann.evaluate(relativeTime, SampleVector[0]); neumann.evaluate(relativeTime, SampleVector[0]);
......
...@@ -12,11 +12,11 @@ ...@@ -12,11 +12,11 @@
#include <dune/tectonic/globalnonlinearity.hh> #include <dune/tectonic/globalnonlinearity.hh>
template <class GridView, class LocalVectorType, class AssemblerType> template <class GridView, class LocalVectorType, class AssemblerType>
void assemble_neumann(GridView const &gridView, AssemblerType const &assembler, void assembleNeumann(GridView const &gridView, AssemblerType const &assembler,
Dune::BitSetVector<1> const &neumannNodes, Dune::BitSetVector<1> const &neumannNodes,
Dune::BlockVector<LocalVectorType> &f, Dune::BlockVector<LocalVectorType> &f,
Dune::VirtualFunction<double, double> const &neumann, Dune::VirtualFunction<double, double> const &neumann,
double relativeTime); double relativeTime);
template <class GridView, class LocalVectorType, class AssemblerType> template <class GridView, class LocalVectorType, class AssemblerType>
Dune::shared_ptr<Dune::BlockVector<Dune::FieldVector<double, 1>>> Dune::shared_ptr<Dune::BlockVector<Dune::FieldVector<double, 1>>>
......
...@@ -23,7 +23,7 @@ using GridView = GridType::LeafGridView; ...@@ -23,7 +23,7 @@ using GridView = GridType::LeafGridView;
using P1Basis = P1NodalBasis<GridView, double>; using P1Basis = P1NodalBasis<GridView, double>;
using AssemblerType = Assembler<P1Basis, P1Basis>; using AssemblerType = Assembler<P1Basis, P1Basis>;
template void assemble_neumann<GridView, SmallVector, AssemblerType>( template void assembleNeumann<GridView, SmallVector, AssemblerType>(
GridView const &gridView, AssemblerType const &assembler, GridView const &gridView, AssemblerType const &assembler,
Dune::BitSetVector<1> const &neumannNodes, Dune::BitSetVector<1> const &neumannNodes,
Dune::BlockVector<SmallVector> &f, Dune::BlockVector<SmallVector> &f,
......
...@@ -345,8 +345,8 @@ int main(int argc, char *argv[]) { ...@@ -345,8 +345,8 @@ int main(int argc, char *argv[]) {
// Problem formulation: right-hand side // Problem formulation: right-hand side
auto const createRHS = [&](double _relativeTime, VectorType &_ell) { auto const createRHS = [&](double _relativeTime, VectorType &_ell) {
assemble_neumann(leafView, p1Assembler, neumannNodes, _ell, assembleNeumann(leafView, p1Assembler, neumannNodes, _ell,
neumannFunction, _relativeTime); neumannFunction, _relativeTime);
_ell += gravityFunctional; _ell += gravityFunctional;
}; };
VectorType ell(finestSize); VectorType ell(finestSize);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment