From 68c111f6e2f294bf5ff879d1728233786519baa7 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Thu, 26 Mar 2015 15:46:59 +0100
Subject: [PATCH] [Cleanup] Cosmetics
---
dune/tectonic/myblockproblem.hh | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/dune/tectonic/myblockproblem.hh b/dune/tectonic/myblockproblem.hh
index 435d4f2a..50fbf2e7 100644
--- a/dune/tectonic/myblockproblem.hh
+++ b/dune/tectonic/myblockproblem.hh
@@ -22,7 +22,7 @@
/** \brief Base class for problems where each block can be solved with a
* modified gradient method */
template <class ConvexProblem>
-class MyBlockProblem : /* NOT PUBLIC */ BlockNonlinearGSProblem<ConvexProblem> {
+class MyBlockProblem : /* not public */ BlockNonlinearGSProblem<ConvexProblem> {
private:
typedef BlockNonlinearGSProblem<ConvexProblem> Base;
@@ -107,8 +107,7 @@ class MyBlockProblem : /* NOT PUBLIC */ BlockNonlinearGSProblem<ConvexProblem> {
auto const psi = restrict(problem_.A, problem_.f, u, v, problem_.phi);
Dune::Solvers::Interval<double> D;
psi.subDiff(0, D);
- // NOTE: Numerical instability can actually get us here
- if (D[1] > 0)
+ if (D[1] > 0) // NOTE: Numerical instability can actually get us here
return 0;
int bisectionsteps = 0;
@@ -175,17 +174,15 @@ class MyBlockProblem : /* NOT PUBLIC */ BlockNonlinearGSProblem<ConvexProblem> {
auto const blockEnd = std::end((*col_it)[i]);
for (auto blockIt = std::begin((*col_it)[i]); blockIt != blockEnd;
++blockIt)
- if (linearization.truncation[row][i] ||
+ if (linearization.truncation[row][i] or
linearization.truncation[col][blockIt.index()])
*blockIt = 0.0;
}
}
-
for (size_t j = 0; j < block_size; ++j)
if (linearization.truncation[row][j])
linearization.b[row][j] = 0.0;
}
-
for (size_t j = 0; j < block_size; ++j)
outStream << std::setw(9) << linearization.truncation.countmasked(j);
}
@@ -266,13 +263,9 @@ class MyBlockProblem<ConvexProblem>::IterateObject {
}
private:
- // problem data
ConvexProblem const &problem;
-
std::vector<double> maxEigenvalues_;
-
Bisection const bisection_;
-
// state data for smoothing procedure used by:
// setIterate, updateIterate, solveLocalProblem
VectorType u;
--
GitLab