From 4bea0810fd34a7338031c25e88317f66f88a31dc Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Tue, 4 Nov 2014 12:03:10 +0100
Subject: [PATCH] [Extern] Use upstream's new constructor
---
src/assemblers.cc | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/assemblers.cc b/src/assemblers.cc
index 496c12a3..64a99904 100644
--- a/src/assemblers.cc
+++ b/src/assemblers.cc
@@ -95,9 +95,9 @@ void MyAssembler<GridView, dimension>::assembleNeumann(
Dune::VirtualFunction<double, double> const &neumann, double relativeTime) {
LocalVector localNeumann(0);
neumann.evaluate(relativeTime, localNeumann[0]);
- ConstantFunction<LocalVector, LocalVector> const fNeumann(localNeumann);
NeumannBoundaryAssembler<Grid, LocalVector> neumannBoundaryAssembler(
- fNeumann);
+ std::make_shared<ConstantFunction<LocalVector, LocalVector>>(
+ localNeumann));
vertexAssembler.assembleBoundaryFunctional(neumannBoundaryAssembler, f,
neumannBoundary);
}
@@ -134,10 +134,10 @@ auto MyAssembler<GridView, dimension>::assembleFrictionNonlinearity(
// Lump negative normal stress (kludge)
ScalarVector weights;
{
- ConstantFunction<LocalVector, typename ScalarVector::block_type> const
- constantOneFunction(1);
NeumannBoundaryAssembler<Grid, typename ScalarVector::block_type>
- frictionalBoundaryAssembler(constantOneFunction);
+ frictionalBoundaryAssembler(std::make_shared<
+ ConstantFunction<LocalVector, typename ScalarVector::block_type>>(
+ 1));
vertexAssembler.assembleBoundaryFunctional(frictionalBoundaryAssembler,
weights, frictionalBoundary);
}
--
GitLab