Skip to content
Snippets Groups Projects
Commit 7508ec1b authored by Oliver Sander's avatar Oliver Sander Committed by sander@PCPOOL.MI.FU-BERLIN.DE
Browse files

activate evaluate() method again 

[[Imported from SVN: r5525]]
parent 90454e33
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/localgeodesicfefunction.hh
+ 3
− 4
View file @ 7508ec1b
...@@ -48,9 +48,8 @@ template <int dim, class ctype, class TargetSpace> ...@@ -48,9 +48,8 @@ template <int dim, class ctype, class TargetSpace>
TargetSpace LocalGeodesicFEFunction<dim,ctype,TargetSpace>:: TargetSpace LocalGeodesicFEFunction<dim,ctype,TargetSpace>::
evaluate(const Dune::FieldVector<ctype, dim>& local) evaluate(const Dune::FieldVector<ctype, dim>& local)
{ {
#warning Some code out-commented // First compute the coordinates on the standard simplex (in R^{n+1})
#if 0 std::vector<ctype> barycentricCoordinates(dim+1);
Dune::FieldVector<ctype, dim+1> barycentricCoordinates;
barycentricCoordinates[0] = 1; barycentricCoordinates[0] = 1;
for (int i=0; i<dim; i++) { for (int i=0; i<dim; i++) {
...@@ -64,6 +63,7 @@ evaluate(const Dune::FieldVector<ctype, dim>& local) ...@@ -64,6 +63,7 @@ evaluate(const Dune::FieldVector<ctype, dim>& local)
solver.setup(&assembler, solver.setup(&assembler,
coefficients_[0], // initial iterate coefficients_[0], // initial iterate
1e-3, // tolerance
20, // maxTrustRegionSteps 20, // maxTrustRegionSteps
1, // initial trust region radius 1, // initial trust region radius
20, // inner iterations 20, // inner iterations
...@@ -73,7 +73,6 @@ evaluate(const Dune::FieldVector<ctype, dim>& local) ...@@ -73,7 +73,6 @@ evaluate(const Dune::FieldVector<ctype, dim>& local)
solver.solve(); solver.solve();
return solver.getSol(); return solver.getSol();
#endif
} }
template <int dim, class ctype, class TargetSpace> template <int dim, class ctype, class TargetSpace>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment