From dfd0c92e5c241a719ce5da770d4ec1ed22cae444 Mon Sep 17 00:00:00 2001
From: Oliver Sander <sander@igpm.rwth-aachen.de>
Date: Mon, 24 Mar 2014 13:09:32 +0000
Subject: [PATCH] Compile again now that the assembleHessian method is called
assembleGradientAndHessian
[[Imported from SVN: r9680]]
---
test/adolctest.cc | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/test/adolctest.cc b/test/adolctest.cc
index 913439ba..5c5d6cb4 100644
--- a/test/adolctest.cc
+++ b/test/adolctest.cc
@@ -131,9 +131,12 @@ int testHarmonicEnergy() {
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- harmonicEnergyLocalStiffness.assembleHessian(*grid.template leafbegin<0>(),localFiniteElement, localSolution);
+ std::vector<typename TargetSpace::TangentVector> localGradient;
+ harmonicEnergyLocalStiffness.assembleGradientAndHessian(*grid.template leafbegin<0>(),localFiniteElement, localSolution,
+ localGradient);
- localGFEADOLCStiffness.assembleHessian(*grid.template leafbegin<0>(),localFiniteElement, localSolution);
+ localGFEADOLCStiffness.assembleGradientAndHessian(*grid.template leafbegin<0>(),localFiniteElement, localSolution,
+ localGradient);
compareMatrices(harmonicEnergyLocalStiffness.A_, localGFEADOLCStiffness.A_, localSolution);
@@ -198,12 +201,15 @@ int testCosseratEnergy() {
for (size_t j=0; j<nDofs; j++)
localSolution[j] = testPoints[index[j]];
- if (diameter(localSolution) > TargetSpace::convexityRadius)
+ if (diameter(localSolution) > 0.5*TargetSpace::convexityRadius)
continue;
- cosseratEnergyLocalStiffness.assembleHessian(*grid.leafbegin<0>(),localFiniteElement, localSolution);
+ std::vector<typename TargetSpace::TangentVector> localGradient;
+ cosseratEnergyLocalStiffness.assembleGradientAndHessian(*grid.leafbegin<0>(),localFiniteElement, localSolution,
+ localGradient);
- localGFEADOLCStiffness.assembleHessian(*grid.leafbegin<0>(),localFiniteElement, localSolution);
+ localGFEADOLCStiffness.assembleGradientAndHessian(*grid.leafbegin<0>(),localFiniteElement, localSolution,
+ localGradient);
compareMatrices(cosseratEnergyLocalStiffness.A_, localGFEADOLCStiffness.A_, localSolution);
--
GitLab