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

[Extern] Use upstream's new constructor

parent 6e5d2149
No related branches found
No related tags found
No related merge requests found
...@@ -95,9 +95,9 @@ void MyAssembler<GridView, dimension>::assembleNeumann( ...@@ -95,9 +95,9 @@ void MyAssembler<GridView, dimension>::assembleNeumann(
Dune::VirtualFunction<double, double> const &neumann, double relativeTime) { Dune::VirtualFunction<double, double> const &neumann, double relativeTime) {
LocalVector localNeumann(0); LocalVector localNeumann(0);
neumann.evaluate(relativeTime, localNeumann[0]); neumann.evaluate(relativeTime, localNeumann[0]);
ConstantFunction<LocalVector, LocalVector> const fNeumann(localNeumann);
NeumannBoundaryAssembler<Grid, LocalVector> neumannBoundaryAssembler( NeumannBoundaryAssembler<Grid, LocalVector> neumannBoundaryAssembler(
fNeumann); std::make_shared<ConstantFunction<LocalVector, LocalVector>>(
localNeumann));
vertexAssembler.assembleBoundaryFunctional(neumannBoundaryAssembler, f, vertexAssembler.assembleBoundaryFunctional(neumannBoundaryAssembler, f,
neumannBoundary); neumannBoundary);
} }
...@@ -134,10 +134,10 @@ auto MyAssembler<GridView, dimension>::assembleFrictionNonlinearity( ...@@ -134,10 +134,10 @@ auto MyAssembler<GridView, dimension>::assembleFrictionNonlinearity(
// Lump negative normal stress (kludge) // Lump negative normal stress (kludge)
ScalarVector weights; ScalarVector weights;
{ {
ConstantFunction<LocalVector, typename ScalarVector::block_type> const
constantOneFunction(1);
NeumannBoundaryAssembler<Grid, typename ScalarVector::block_type> NeumannBoundaryAssembler<Grid, typename ScalarVector::block_type>
frictionalBoundaryAssembler(constantOneFunction); frictionalBoundaryAssembler(std::make_shared<
ConstantFunction<LocalVector, typename ScalarVector::block_type>>(
1));
vertexAssembler.assembleBoundaryFunctional(frictionalBoundaryAssembler, vertexAssembler.assembleBoundaryFunctional(frictionalBoundaryAssembler,
weights, frictionalBoundary); weights, frictionalBoundary);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment