From 8093a2bed9136467ea1615522a9bdfc4bd3e83da Mon Sep 17 00:00:00 2001
From: Jonathan Youett <youett@math.fu-berlin.de>
Date: Fri, 2 Mar 2018 15:00:17 +0100
Subject: [PATCH] GeodesicFEAssembler does not take raw pointers anymore
---
dune/gfe/rodassembler.hh | 2 +-
src/cosserat-continuum.cc | 2 +-
src/gradient-flow.cc | 2 +-
src/harmonicmaps.cc | 2 +-
src/rod3d.cc | 2 +-
test/frameinvariancetest.cc | 2 +-
test/harmonicmaptest.cc | 2 +-
test/rodassemblertest.cc | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dune/gfe/rodassembler.hh b/dune/gfe/rodassembler.hh
index 0b113a1d..64c1327e 100644
--- a/dune/gfe/rodassembler.hh
+++ b/dune/gfe/rodassembler.hh
@@ -41,7 +41,7 @@ class RodAssembler<Basis,3> : public GeodesicFEAssembler<Basis, RigidBodyMotion<
public:
//! ???
RodAssembler(const Basis& basis,
- LocalGeodesicFEStiffness<Basis, RigidBodyMotion<double,3> >* localStiffness)
+ LocalGeodesicFEStiffness<Basis, RigidBodyMotion<double,3> >& localStiffness)
: GeodesicFEAssembler<Basis, RigidBodyMotion<double,3> >(basis,localStiffness)
{
std::vector<RigidBodyMotion<double,3> > referenceConfiguration(basis.size());
diff --git a/src/cosserat-continuum.cc b/src/cosserat-continuum.cc
index a64eefe9..294d78a0 100644
--- a/src/cosserat-continuum.cc
+++ b/src/cosserat-continuum.cc
@@ -462,7 +462,7 @@ int main (int argc, char *argv[]) try
LocalGeodesicFEADOLCStiffness<FEBasis,
TargetSpace> localGFEADOLCStiffness(localCosseratEnergy.get());
- GeodesicFEAssembler<FEBasis,TargetSpace> assembler(gridView, &localGFEADOLCStiffness);
+ GeodesicFEAssembler<FEBasis,TargetSpace> assembler(gridView, localGFEADOLCStiffness);
#endif
// /////////////////////////////////////////////////
diff --git a/src/gradient-flow.cc b/src/gradient-flow.cc
index 3879b56e..ac87cc85 100644
--- a/src/gradient-flow.cc
+++ b/src/gradient-flow.cc
@@ -211,7 +211,7 @@ int main (int argc, char *argv[]) try
LocalGeodesicFEADOLCStiffness<FEBasis,TargetSpace> localGFEADOLCStiffness(sumEnergy.get());
- GeodesicFEAssembler<FEBasis,TargetSpace> assembler(feBasis, &localGFEADOLCStiffness);
+ GeodesicFEAssembler<FEBasis,TargetSpace> assembler(feBasis, localGFEADOLCStiffness);
///////////////////////////////////////////////////
// Create a Riemannian trust-region solver
diff --git a/src/harmonicmaps.cc b/src/harmonicmaps.cc
index 3cfa8893..68c123eb 100644
--- a/src/harmonicmaps.cc
+++ b/src/harmonicmaps.cc
@@ -305,7 +305,7 @@ int main (int argc, char *argv[])
LocalGeodesicFEADOLCStiffness<FEBasis,TargetSpace> localGFEADOLCStiffness(localEnergy.get());
- GeodesicFEAssembler<FEBasis,TargetSpace> assembler(feBasis, &localGFEADOLCStiffness);
+ GeodesicFEAssembler<FEBasis,TargetSpace> assembler(feBasis, localGFEADOLCStiffness);
// /////////////////////////////////////////////////
// Create a Riemannian trust-region solver
diff --git a/src/rod3d.cc b/src/rod3d.cc
index 90ac7842..8d4a9abc 100644
--- a/src/rod3d.cc
+++ b/src/rod3d.cc
@@ -130,7 +130,7 @@ int main (int argc, char *argv[]) try
LocalGeodesicFEFDStiffness<FEBasis,RigidBodyMotion<double,3> > localFDStiffness(&localStiffness);
- RodAssembler<FEBasis,3> rodAssembler(gridView, &localFDStiffness);
+ RodAssembler<FEBasis,3> rodAssembler(gridView, localFDStiffness);
RiemannianTrustRegionSolver<FEBasis,RigidBodyMotion<double,3> > rodSolver;
diff --git a/test/frameinvariancetest.cc b/test/frameinvariancetest.cc
index 56c00781..dcf53d48 100644
--- a/test/frameinvariancetest.cc
+++ b/test/frameinvariancetest.cc
@@ -79,7 +79,7 @@ int main (int argc, char *argv[]) try
LocalGeodesicFEFDStiffness<FEBasis,RigidBodyMotion<double,3> > localFDStiffness(&localRodFirstOrderModel);
- RodAssembler<FEBasis,3> assembler(feBasis, &localFDStiffness);
+ RodAssembler<FEBasis,3> assembler(feBasis, localFDStiffness);
if (std::abs(assembler.computeEnergy(x) - assembler.computeEnergy(rotatedX)) > 1e-6)
DUNE_THROW(Dune::Exception, "Rod energy not invariant under rigid body motions!");
diff --git a/test/harmonicmaptest.cc b/test/harmonicmaptest.cc
index 1b11a59d..adc1467b 100644
--- a/test/harmonicmaptest.cc
+++ b/test/harmonicmaptest.cc
@@ -160,7 +160,7 @@ int main (int argc, char *argv[])
LocalGeodesicFEADOLCStiffness<FEBasis,TargetSpace> localGFEADOLCStiffness(localEnergy.get());
- GeodesicFEAssembler<FEBasis,TargetSpace> assembler(feBasis, &localGFEADOLCStiffness);
+ GeodesicFEAssembler<FEBasis,TargetSpace> assembler(feBasis, localGFEADOLCStiffness);
///////////////////////////////////////////////////
// Create a Riemannian trust-region solver
diff --git a/test/rodassemblertest.cc b/test/rodassemblertest.cc
index 20c186d3..55400783 100644
--- a/test/rodassemblertest.cc
+++ b/test/rodassemblertest.cc
@@ -553,7 +553,7 @@ int main (int argc, char *argv[]) try
LocalGeodesicFEFDStiffness<Basis,RigidBodyMotion<double,3> > localFDStiffness(&localStiffness);
- RodAssembler<Basis,3> rodAssembler(basis, &localFDStiffness);
+ RodAssembler<Basis,3> rodAssembler(basis, localFDStiffness);
std::cout << "Energy: " << rodAssembler.computeEnergy(x) << std::endl;
--
GitLab