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

out-comment some half-finished code

[[Imported from SVN: r4470]]
parent b132331b
No related branches found
No related tags found
No related merge requests found
...@@ -69,6 +69,8 @@ evaluate(const Dune::FieldVector<ctype, dim>& local) ...@@ -69,6 +69,8 @@ evaluate(const Dune::FieldVector<ctype, dim>& local)
return result; return result;
#endif #endif
#warning Some code out-commented
#if 0
Dune::FieldVector<ctype, dim+1> barycentricCoordinates; Dune::FieldVector<ctype, dim+1> barycentricCoordinates;
barycentricCoordinates[0] = 1; barycentricCoordinates[0] = 1;
...@@ -92,6 +94,7 @@ evaluate(const Dune::FieldVector<ctype, dim>& local) ...@@ -92,6 +94,7 @@ 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>
......
...@@ -28,7 +28,7 @@ setup(const AverageDistanceAssembler<TargetSpace>* assembler, ...@@ -28,7 +28,7 @@ setup(const AverageDistanceAssembler<TargetSpace>* assembler,
// First create a Gauss-seidel base solver // First create a Gauss-seidel base solver
TrustRegionGSStep<MatrixType, CorrectionType>* innerSolverStep = new TrustRegionGSStep<MatrixType, CorrectionType>; 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, innerSolver_ = new ::LoopSolver<CorrectionType>(innerSolverStep,
innerIterations, innerIterations,
...@@ -49,6 +49,7 @@ setup(const AverageDistanceAssembler<TargetSpace>* assembler, ...@@ -49,6 +49,7 @@ setup(const AverageDistanceAssembler<TargetSpace>* assembler,
template <class TargetSpace> template <class TargetSpace>
void TargetSpaceRiemannianTRSolver<TargetSpace>::solve() void TargetSpaceRiemannianTRSolver<TargetSpace>::solve()
{ {
#if 0
MaxNormTrustRegion<blocksize> trustRegion(x_.size(), initialTrustRegionRadius_); MaxNormTrustRegion<blocksize> trustRegion(x_.size(), initialTrustRegionRadius_);
std::vector<std::vector<BoxConstraint<field_type,blocksize> > > trustRegionObstacles((mgStep) std::vector<std::vector<BoxConstraint<field_type,blocksize> > > trustRegionObstacles((mgStep)
...@@ -182,5 +183,5 @@ void TargetSpaceRiemannianTRSolver<TargetSpace>::solve() ...@@ -182,5 +183,5 @@ void TargetSpaceRiemannianTRSolver<TargetSpace>::solve()
std::cout << "--- Current energy: " << energy << " ---" << std::endl; std::cout << "--- Current energy: " << energy << " ---" << std::endl;
} }
#endif
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment