From 7508ec1b93bcb9b508521cac7affbb19d87942ba Mon Sep 17 00:00:00 2001
From: Oliver Sander <sander@igpm.rwth-aachen.de>
Date: Wed, 10 Feb 2010 21:11:36 +0000
Subject: [PATCH] activate evaluate() method again
[[Imported from SVN: r5525]]
---
src/localgeodesicfefunction.hh | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/localgeodesicfefunction.hh b/src/localgeodesicfefunction.hh
index 439bc063..0c66b44a 100644
--- a/src/localgeodesicfefunction.hh
+++ b/src/localgeodesicfefunction.hh
@@ -48,9 +48,8 @@ template <int dim, class ctype, class TargetSpace>
TargetSpace LocalGeodesicFEFunction<dim,ctype,TargetSpace>::
evaluate(const Dune::FieldVector<ctype, dim>& local)
{
-#warning Some code out-commented
-#if 0
- Dune::FieldVector<ctype, dim+1> barycentricCoordinates;
+ // First compute the coordinates on the standard simplex (in R^{n+1})
+ std::vector<ctype> barycentricCoordinates(dim+1);
barycentricCoordinates[0] = 1;
for (int i=0; i<dim; i++) {
@@ -64,6 +63,7 @@ evaluate(const Dune::FieldVector<ctype, dim>& local)
solver.setup(&assembler,
coefficients_[0], // initial iterate
+ 1e-3, // tolerance
20, // maxTrustRegionSteps
1, // initial trust region radius
20, // inner iterations
@@ -73,7 +73,6 @@ evaluate(const Dune::FieldVector<ctype, dim>& local)
solver.solve();
return solver.getSol();
-#endif
}
template <int dim, class ctype, class TargetSpace>
--
GitLab