From f93e433f20628c060f8a1e53cd09f97055c2f07a Mon Sep 17 00:00:00 2001
From: Oliver Sander <sander@igpm.rwth-aachen.de>
Date: Wed, 5 Aug 2009 14:42:04 +0000
Subject: [PATCH] out-comment some half-finished code
[[Imported from SVN: r4470]]
---
src/localgeodesicfefunction.hh | 3 +++
src/targetspacertrsolver.cc | 5 +++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/localgeodesicfefunction.hh b/src/localgeodesicfefunction.hh
index 086af328..744d7c12 100644
--- a/src/localgeodesicfefunction.hh
+++ b/src/localgeodesicfefunction.hh
@@ -69,6 +69,8 @@ evaluate(const Dune::FieldVector<ctype, dim>& local)
return result;
#endif
+#warning Some code out-commented
+#if 0
Dune::FieldVector<ctype, dim+1> barycentricCoordinates;
barycentricCoordinates[0] = 1;
@@ -92,6 +94,7 @@ evaluate(const Dune::FieldVector<ctype, dim>& local)
solver.solve();
return solver.getSol();
+#endif
}
template <int dim, class ctype, class TargetSpace>
diff --git a/src/targetspacertrsolver.cc b/src/targetspacertrsolver.cc
index fdf5b1ff..0d9e5116 100644
--- a/src/targetspacertrsolver.cc
+++ b/src/targetspacertrsolver.cc
@@ -28,7 +28,7 @@ setup(const AverageDistanceAssembler<TargetSpace>* assembler,
// First create a Gauss-seidel base solver
TrustRegionGSStep<MatrixType, CorrectionType>* innerSolverStep = new TrustRegionGSStep<MatrixType, CorrectionType>;
- EnergyNorm<MatrixType, CorrectionType>* energyNorm = new EnergyNorm<MatrixType, CorrectionType>(*baseSolverStep);
+ EnergyNorm<MatrixType, CorrectionType>* energyNorm = new EnergyNorm<MatrixType, CorrectionType>(*innerSolverStep);
innerSolver_ = new ::LoopSolver<CorrectionType>(innerSolverStep,
innerIterations,
@@ -49,6 +49,7 @@ setup(const AverageDistanceAssembler<TargetSpace>* assembler,
template <class TargetSpace>
void TargetSpaceRiemannianTRSolver<TargetSpace>::solve()
{
+#if 0
MaxNormTrustRegion<blocksize> trustRegion(x_.size(), initialTrustRegionRadius_);
std::vector<std::vector<BoxConstraint<field_type,blocksize> > > trustRegionObstacles((mgStep)
@@ -182,5 +183,5 @@ void TargetSpaceRiemannianTRSolver<TargetSpace>::solve()
std::cout << "--- Current energy: " << energy << " ---" << std::endl;
}
-
+#endif
}
--
GitLab