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

[Cleanup] Move declarations

parent 374fd746
No related branches found
No related tags found
No related merge requests found
...@@ -244,6 +244,7 @@ int main(int argc, char *argv[]) { ...@@ -244,6 +244,7 @@ int main(int argc, char *argv[]) {
; ;
} }
} }
BoundaryPatch<GridView> const frictionalBoundary(leafView, frictionalNodes);
// Set up functions for time-dependent boundary conditions // Set up functions for time-dependent boundary conditions
using FunctionType = Dune::VirtualFunction<double, double>; using FunctionType = Dune::VirtualFunction<double, double>;
...@@ -324,9 +325,6 @@ int main(int argc, char *argv[]) { ...@@ -324,9 +325,6 @@ int main(int argc, char *argv[]) {
EnergyNorm<SingletonMatrixType, SingletonVectorType> const stateEnergyNorm( EnergyNorm<SingletonMatrixType, SingletonVectorType> const stateEnergyNorm(
frictionalBoundaryMassMatrix); frictionalBoundaryMassMatrix);
{ {
BoundaryPatch<GridView> const frictionalBoundary(leafView,
frictionalNodes);
BoundaryMassAssembler< BoundaryMassAssembler<
GridType, BoundaryPatch<GridView>, P1Basis::LocalFiniteElement, GridType, BoundaryPatch<GridView>, P1Basis::LocalFiniteElement,
P1Basis::LocalFiniteElement, SmallSingletonMatrix> const P1Basis::LocalFiniteElement, SmallSingletonMatrix> const
...@@ -580,10 +578,10 @@ int main(int argc, char *argv[]) { ...@@ -580,10 +578,10 @@ int main(int argc, char *argv[]) {
relaxationWriter << std::endl; relaxationWriter << std::endl;
if (parset.get<bool>("io.writeVTK")) { if (parset.get<bool>("io.writeVTK")) {
SingletonVectorType vonMisesStress;
auto const gridDisplacement = auto const gridDisplacement =
Dune::make_shared<BasisGridFunction<P1Basis, VectorType> const>( Dune::make_shared<BasisGridFunction<P1Basis, VectorType> const>(
p1Basis, u); p1Basis, u);
SingletonVectorType vonMisesStress;
VonMisesStressAssembler<GridType> localStressAssembler( VonMisesStressAssembler<GridType> localStressAssembler(
E, nu, gridDisplacement); E, nu, gridDisplacement);
p0Assembler.assembleFunctional(localStressAssembler, vonMisesStress); p0Assembler.assembleFunctional(localStressAssembler, vonMisesStress);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment