From 76f9d1dfea3e1c9c5f6e542edccca6c1aaf23da7 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Tue, 22 Sep 2015 13:02:02 +0200
Subject: [PATCH] Only trailing whitespace
and no play makes Jack a dull boy
---
dune/solvers/solvers/cgsolver.cc | 20 ++++++++++----------
dune/solvers/solvers/cgsolver.hh | 16 ++++++++--------
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/dune/solvers/solvers/cgsolver.cc b/dune/solvers/solvers/cgsolver.cc
index 00ac8a41..7735cac0 100644
--- a/dune/solvers/solvers/cgsolver.cc
+++ b/dune/solvers/solvers/cgsolver.cc
@@ -65,13 +65,13 @@ void CGSolver<MatrixType, VectorType>::solve()
VectorType p(*x_); // the search direction
VectorType q(*x_); // a temporary vector
-
+
// some local variables
double rho,rholast,lambda,alpha,beta;
-
+
// determine initial search direction
p = 0; // clear correction
-
+
if (preconditioner_) {
preconditioner_->setProblem(*matrix_,p,b);
preconditioner_->iterate();
@@ -80,13 +80,13 @@ void CGSolver<MatrixType, VectorType>::solve()
p = b;
rholast = p*b; // orthogonalization
-
+
// Loop until desired tolerance or maximum number of iterations is reached
for (i=0; i<this->maxIterations_ && (error>this->tolerance_ || std::isnan(error)); i++) {
-
+
// Backup of the current solution for the error computation later on
VectorType oldSolution = *x_;
-
+
// Perform one iteration step
// minimize in given search direction p
matrix_->mv(p,q); // q=Ap
@@ -97,7 +97,7 @@ void CGSolver<MatrixType, VectorType>::solve()
// determine new search direction
q = 0; // clear correction
-
+
// apply preconditioner
if (preconditioner_) {
preconditioner_->setProblem(*matrix_,q,b);
@@ -105,7 +105,7 @@ void CGSolver<MatrixType, VectorType>::solve()
q = preconditioner_->getSol();
} else
q = b;
-
+
rho = q*b; // orthogonalization
beta = rho/rholast; // scaling factor
p *= beta; // scale old search direction
@@ -113,10 +113,10 @@ void CGSolver<MatrixType, VectorType>::solve()
rholast = rho; // remember rho for recurrence
// write iteration to file, if requested
- if (this->historyBuffer_!="")
+ if (this->historyBuffer_!="")
this->writeIterate(*x_, i);
- // Compute error
+ // Compute error
double oldNorm = errorNorm_->operator()(oldSolution);
oldSolution -= *x_;
diff --git a/dune/solvers/solvers/cgsolver.hh b/dune/solvers/solvers/cgsolver.hh
index c1677e56..99561566 100644
--- a/dune/solvers/solvers/cgsolver.hh
+++ b/dune/solvers/solvers/cgsolver.hh
@@ -7,7 +7,7 @@
#include <dune/solvers/iterationsteps/lineariterationstep.hh>
#include <dune/solvers/norms/norm.hh>
-/** \brief A conjugate gradient solver
+/** \brief A conjugate gradient solver
*
*/
template <class MatrixType, class VectorType>
@@ -15,10 +15,10 @@ class CGSolver : public IterativeSolver<VectorType>
{
static const int blocksize = VectorType::block_type::dimension;
-public:
+public:
/** \brief Constructor taking all relevant data */
-
+
CGSolver(const MatrixType* matrix,
VectorType* x,
VectorType* rhs,
@@ -32,11 +32,11 @@ public:
matrix_(matrix), x_(x), rhs_(rhs),
preconditioner_(preconditioner), errorNorm_(errorNorm)
{}
-
+
/** \brief Loop, call the iteration procedure
* and monitor convergence */
virtual void solve();
-
+
/** \brief Checks whether all relevant member variables are set
* \exception SolverError if the iteration step is not set up properly
*/
@@ -47,13 +47,13 @@ public:
VectorType* x_;
VectorType* rhs_;
-
+
//! The iteration step used by the algorithm
LinearIterationStep<MatrixType,VectorType>* preconditioner_;
-
+
//! The norm used to measure convergence
Norm<VectorType>* errorNorm_;
-
+
};
#include "cgsolver.cc"
--
GitLab