diff --git a/lib/algorithms/iterative/CommunicationAvoidingGeneralisedMinimalResidual.h b/lib/algorithms/iterative/CommunicationAvoidingGeneralisedMinimalResidual.h index 2e574639..dfa0da8e 100644 --- a/lib/algorithms/iterative/CommunicationAvoidingGeneralisedMinimalResidual.h +++ b/lib/algorithms/iterative/CommunicationAvoidingGeneralisedMinimalResidual.h @@ -56,10 +56,10 @@ class CommunicationAvoidingGeneralisedMinimalResidual : public OperatorFunction< std::vector> c; std::vector> s; - CommunicationAvoidingGeneralisedMinimalResidual(RealD tol, - Integer maxit, - Integer restart_length, - bool err_on_no_conv = true) + CommunicationAvoidingGeneralisedMinimalResidual(RealD tol, + Integer maxit, + Integer restart_length, + bool err_on_no_conv = true) : Tolerance(tol) , MaxIterations(maxit) , RestartLength(restart_length) @@ -115,16 +115,16 @@ class CommunicationAvoidingGeneralisedMinimalResidual : public OperatorFunction< RealD true_residual = resnorm / srcnorm; std::cout << GridLogMessage << "CommunicationAvoidingGeneralisedMinimalResidual: Converged on iteration " << IterationCount << std::endl; - std::cout << GridLogMessage << "\tComputed residual " << sqrt(cp / ssq) << std::endl; - std::cout << GridLogMessage << "\tTrue residual " << true_residual << std::endl; - std::cout << GridLogMessage << "\tTarget " << Tolerance << std::endl; + std::cout << GridLogMessage << "\tComputed residual " << sqrt(cp / ssq) << std::endl; + std::cout << GridLogMessage << "\tTrue residual " << true_residual << std::endl; + std::cout << GridLogMessage << "\tTarget " << Tolerance << std::endl; std::cout << GridLogMessage << "CommunicationAvoidingGeneralisedMinimalResidual Time breakdown" << std::endl; - std::cout << GridLogMessage << "\tElapsed " << SolverTimer.Elapsed() << std::endl; - std::cout << GridLogMessage << "\tMatrix " << MatrixTimer.Elapsed() << std::endl; - std::cout << GridLogMessage << "\tLinalg " << LinalgTimer.Elapsed() << std::endl; - std::cout << GridLogMessage << "\tQR " << QrTimer.Elapsed() << std::endl; - std::cout << GridLogMessage << "\tCompSol " << CompSolutionTimer.Elapsed() << std::endl; + std::cout << GridLogMessage << "\tElapsed " << SolverTimer.Elapsed() << std::endl; + std::cout << GridLogMessage << "\tMatrix " << MatrixTimer.Elapsed() << std::endl; + std::cout << GridLogMessage << "\tLinalg " << LinalgTimer.Elapsed() << std::endl; + std::cout << GridLogMessage << "\tQR " << QrTimer.Elapsed() << std::endl; + std::cout << GridLogMessage << "\tCompSol " << CompSolutionTimer.Elapsed() << std::endl; return; } } diff --git a/lib/algorithms/iterative/FlexibleGeneralisedMinimalResidual.h b/lib/algorithms/iterative/FlexibleGeneralisedMinimalResidual.h index f190e386..f885b902 100644 --- a/lib/algorithms/iterative/FlexibleGeneralisedMinimalResidual.h +++ b/lib/algorithms/iterative/FlexibleGeneralisedMinimalResidual.h @@ -121,17 +121,17 @@ class FlexibleGeneralisedMinimalResidual : public OperatorFunction { RealD true_residual = resnorm / srcnorm; std::cout << GridLogMessage << "FlexibleGeneralisedMinimalResidual: Converged on iteration " << IterationCount << std::endl; - std::cout << GridLogMessage << "\tComputed residual " << sqrt(cp / ssq) << std::endl; - std::cout << GridLogMessage << "\tTrue residual " << true_residual << std::endl; - std::cout << GridLogMessage << "\tTarget " << Tolerance << std::endl; + std::cout << GridLogMessage << "\tComputed residual " << sqrt(cp / ssq) << std::endl; + std::cout << GridLogMessage << "\tTrue residual " << true_residual << std::endl; + std::cout << GridLogMessage << "\tTarget " << Tolerance << std::endl; std::cout << GridLogMessage << "FlexibleGeneralisedMinimalResidual Time breakdown" << std::endl; - std::cout << GridLogMessage << "\tElapsed " << SolverTimer.Elapsed() << std::endl; - std::cout << GridLogMessage << "\tPrecon " << PrecTimer.Elapsed() << std::endl; - std::cout << GridLogMessage << "\tMatrix " << MatrixTimer.Elapsed() << std::endl; - std::cout << GridLogMessage << "\tLinalg " << LinalgTimer.Elapsed() << std::endl; - std::cout << GridLogMessage << "\tQR " << QrTimer.Elapsed() << std::endl; - std::cout << GridLogMessage << "\tCompSol " << CompSolutionTimer.Elapsed() << std::endl; + std::cout << GridLogMessage << "\tElapsed " << SolverTimer.Elapsed() << std::endl; + std::cout << GridLogMessage << "\tPrecon " << PrecTimer.Elapsed() << std::endl; + std::cout << GridLogMessage << "\tMatrix " << MatrixTimer.Elapsed() << std::endl; + std::cout << GridLogMessage << "\tLinalg " << LinalgTimer.Elapsed() << std::endl; + std::cout << GridLogMessage << "\tQR " << QrTimer.Elapsed() << std::endl; + std::cout << GridLogMessage << "\tCompSol " << CompSolutionTimer.Elapsed() << std::endl; return; } } diff --git a/lib/algorithms/iterative/GeneralisedMinimalResidual.h b/lib/algorithms/iterative/GeneralisedMinimalResidual.h index 76c9a8bf..e426b6f3 100644 --- a/lib/algorithms/iterative/GeneralisedMinimalResidual.h +++ b/lib/algorithms/iterative/GeneralisedMinimalResidual.h @@ -115,9 +115,9 @@ class GeneralisedMinimalResidual : public OperatorFunction { RealD true_residual = resnorm / srcnorm; std::cout << GridLogMessage << "GeneralisedMinimalResidual: Converged on iteration " << IterationCount << std::endl; - std::cout << GridLogMessage << "\tComputed residual " << sqrt(cp / ssq) << std::endl; - std::cout << GridLogMessage << "\tTrue residual " << true_residual << std::endl; - std::cout << GridLogMessage << "\tTarget " << Tolerance << std::endl; + std::cout << GridLogMessage << "\tComputed residual " << sqrt(cp / ssq) << std::endl; + std::cout << GridLogMessage << "\tTrue residual " << true_residual << std::endl; + std::cout << GridLogMessage << "\tTarget " << Tolerance << std::endl; std::cout << GridLogMessage << "GeneralisedMinimalResidual Time breakdown" << std::endl; std::cout << GridLogMessage << "\tElapsed " << SolverTimer.Elapsed() << std::endl;