Improved refreshing of iterative solver monitor's state

This will ensure that in verbose mode, the final state of the linear
system solvers is always printed. Previously this was the case only when
refresh rate was equal to 1.

src/solvers/linear/krylov/tnlBICGStabSolver_impl.h

@@ -193,7 +193,7 @@ bool tnlBICGStabSolver< Matrix, Preconditioner > :: solve( const Vector& b, Vect
          this->setResidue( ResidueGetter :: getResidue( *matrix, b, x, bNorm ) );
    }
    //this->setResidue( ResidueGetter :: getResidue( *matrix, b, x, bNorm ) );
-   this->refreshSolverMonitor();
+   this->refreshSolverMonitor( true );
    return this->checkConvergence();
 };
 

src/solvers/linear/krylov/tnlCGSolver_impl.h

@@ -142,7 +142,7 @@ solve( const Vector& b, Vector& x )
          this -> setResidue( ResidueGetter :: getResidue( *matrix, b, x, bNorm ) );
    }
    this -> setResidue( ResidueGetter :: getResidue( *matrix, b, x, bNorm ) );
-   this -> refreshSolverMonitor();
+   this -> refreshSolverMonitor( true );
    return this->checkConvergence();
 };
 

src/solvers/linear/krylov/tnlGMRESSolver_impl.h

@@ -289,7 +289,7 @@ bool tnlGMRESSolver< Matrix, Preconditioner > :: solve( const Vector& b, Vector&
       //cout << "residue = " << beta / normb << endl;
 
    }
-   this->refreshSolverMonitor();
+   this->refreshSolverMonitor( true );
    return this->checkConvergence();
 };
 

src/solvers/linear/krylov/tnlTFQMRSolver_impl.h

@@ -154,8 +154,9 @@ bool tnlTFQMRSolver< Matrix, Preconditioner > :: solve( const Vector& b, Vector&
       this -> refreshSolverMonitor();
    }
    this -> setResidue( ResidueGetter :: getResidue( *matrix, b, x, bNorm ) );
-   this -> refreshSolverMonitor();
-      if( this -> getResidue() > this -> getConvergenceResidue() ) return false;
+   this -> refreshSolverMonitor( true );
+   if( this -> getResidue() > this -> getConvergenceResidue() )
+      return false;
    return true;
 };
 

src/solvers/linear/stationary/tnlSORSolver_impl.h

@@ -107,9 +107,10 @@ bool tnlSORSolver< Matrix, Preconditioner > :: solve( const Vector& b,
                                       x,
                                       this->getOmega() );
       this -> setResidue( ResidueGetter :: getResidue( *matrix, x, b, bNorm ) );
+      this -> refreshSolverMonitor();
    }
    this -> setResidue( ResidueGetter :: getResidue( *matrix, x, b, bNorm ) );
-   this -> refreshSolverMonitor();
+   this -> refreshSolverMonitor( true );
    return this->checkConvergence();
 };
 

src/solvers/tnlIterativeSolver.h

@@ -67,7 +67,7 @@ class tnlIterativeSolver
 
    bool checkConvergence();
 
-   void refreshSolverMonitor();
+   void refreshSolverMonitor( bool force = false );
 
 
    protected:

src/solvers/tnlIterativeSolverMonitor.h

@@ -44,7 +44,7 @@ class tnlIterativeSolverMonitor : public tnlSolverMonitor< Real, Index >
    
    void setRefreshRate( const IndexType& refreshRate );
 
-   virtual void refresh();
+   virtual void refresh( bool force = false );
 
    void resetTimers();
 

src/solvers/tnlIterativeSolverMonitor_impl.h

@@ -69,9 +69,9 @@ void tnlIterativeSolverMonitor< Real, Index > :: setRefreshRate( const Index& re
 }
 
 template< typename Real, typename Index>
-void tnlIterativeSolverMonitor< Real, Index > :: refresh()
+void tnlIterativeSolverMonitor< Real, Index > :: refresh( bool force )
 {
-   if( this->verbose > 0 && this->getIterations() % this->refreshRate == 0 )
+   if( this->verbose > 0 && ( force || this->getIterations() % this->refreshRate == 0 ) )
    {
       cout << " ITER:" << setw( 8 ) << this->getIterations()
            << " RES:" << setprecision( 5 ) << setw( 12 ) << this -> getResidue()

src/solvers/tnlIterativeSolver_impl.h

@@ -196,14 +196,14 @@ void tnlIterativeSolver< Real, Index> :: setSolverMonitor( tnlIterativeSolverMon
 }
 
 template< typename Real, typename Index >
-void tnlIterativeSolver< Real, Index> :: refreshSolverMonitor()
+void tnlIterativeSolver< Real, Index> :: refreshSolverMonitor( bool force )
 {
    if( this -> solverMonitor )
    {
       this -> solverMonitor -> setIterations( this -> getIterations() );
       this -> solverMonitor -> setResidue( this -> getResidue() );
       this -> solverMonitor -> setRefreshRate( this-> refreshRate );
-      this -> solverMonitor -> refresh();
+      this -> solverMonitor -> refresh( force );
    }
 }
 

src/solvers/tnlSolverMonitor.h

@@ -23,7 +23,7 @@ class tnlSolverMonitor
 {
    public:
 
-   virtual void refresh() = 0;
+   virtual void refresh( bool force = false ) = 0;
 
    ~tnlSolverMonitor() {};