Skip to content

Commit 9494dfd

Browse files
committed
Fix formatting for nested FGMRES changes
1 parent d516846 commit 9494dfd

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

Common/src/CConfig.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7279,15 +7279,15 @@ void CConfig::SetOutput(SU2_COMPONENT val_software, unsigned short val_izone) {
72797279
case RESTARTED_FGMRES:
72807280
if (Kind_Linear_Solver == BCGSTAB){
72817281
cout << "BCGSTAB is used for solving the linear system." << endl;
7282-
}
7282+
}
72837283
else {
72847284
if (GetNested_Linear_Solver()){
72857285
cout << "Nested FGMRES (FGMRES with inner BiCGSTAB) is used for solving the linear system." << endl;
7286-
}
7287-
else {
7286+
}
7287+
else {
72887288
cout << "FGMRES is used for solving the linear system." << endl;
7289-
}
7290-
}
7289+
}
7290+
}
72917291
switch (Kind_Linear_Solver_Prec) {
72927292
case ILU: cout << "Using a ILU("<< Linear_Solver_ILU_n <<") preconditioning."<< endl; break;
72937293
case LINELET: cout << "Using a linelet preconditioning."<< endl; break;

Common/src/linear_algebra/CSysSolve.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,6 @@ void BCGSTABpre_parallel(const CSysVector<ScalarType>& a, CSysVector<ScalarType>
278278
}
279279
}
280280

281-
282281
template <class ScalarType>
283282
void CSysSolve<ScalarType>::WriteHeader(const string& solver, ScalarType restol, ScalarType resinit) const {
284283
cout << "\n# " << solver << " residual history\n";
@@ -531,7 +530,7 @@ unsigned long CSysSolve<ScalarType>::FGMRES_LinSolver(const CSysVector<ScalarTyp
531530

532531
if (masterRank) {
533532
SU2_OMP_MASTER
534-
cout << "CSysSolve::FGMRES(): system solved by initial guess." << endl;
533+
cout << "CSysSolve::FGMRES(): system solved by initial guess." << endl;
535534
END_SU2_OMP_MASTER
536535
}
537536
residual = beta;
@@ -566,10 +565,9 @@ unsigned long CSysSolve<ScalarType>::FGMRES_LinSolver(const CSysVector<ScalarTyp
566565
if (beta < tol * norm0) break;
567566

568567
if (flexible) {
569-
570568
if (useNestedBiCGSTAB) {
571569
/*--- Nested mod: W[i] by inner BCGSTAB ---*/
572-
Z[i] = ScalarType(0.0);
570+
Z[i] = ScalarType(0.0);
573571
BCGSTABpre_parallel(W[i], Z[i], mat_vec, precond, config);
574572

575573
/*--- Add to Krylov subspace ---*/
@@ -856,7 +854,6 @@ unsigned long CSysSolve<ScalarType>::BCGSTAB_LinSolver(const CSysVector<ScalarTy
856854
return i;
857855
}
858856

859-
860857
template <class ScalarType>
861858
unsigned long CSysSolve<ScalarType>::Smoother_LinSolver(const CSysVector<ScalarType>& b, CSysVector<ScalarType>& x,
862859
const CMatrixVectorProduct<ScalarType>& mat_vec,

0 commit comments

Comments
 (0)