Commit aeff4024 authored by Tomáš Oberhuber's avatar Tomáš Oberhuber
Browse files

Removing useless IterativeSolver::refreshSolverMonitor.

parent 2e8f1ee1

src/Benchmarks/ODESolvers/Euler.hpp

+0 −7
Original line number Diff line number Diff line
@@ -81,8 +81,6 @@ bool Euler< Problem, SolverMonitor >::solve( DofVectorPointer& u ) 
   this->resetIterations();

   this->setResidue( this->getConvergenceResidue() + 1.0 );



   this -> refreshSolverMonitor();



   /****

    * Start the main loop

    */
@@ -128,17 +126,12 @@ bool Euler< Problem, SolverMonitor >::solve( DofVectorPointer& u ) 
         currentTau = this -> getStopTime() - time; //we don't want to keep such tau

      else this -> tau = currentTau;



      this->refreshSolverMonitor();



      /****

       * Check stop conditions.

       */

      if( time >= this->getStopTime() ||

          ( this -> getConvergenceResidue() != 0.0 && this->getResidue() < this -> getConvergenceResidue() ) )

      {

         this -> refreshSolverMonitor();

         return true;

      }



      if( this -> cflCondition != 0.0 )

      {

src/Benchmarks/ODESolvers/Merson.hpp

+0 −7
Original line number Diff line number Diff line
@@ -157,8 +157,6 @@ bool Merson< Problem, SolverMonitor >::solve( DofVectorPointer& u ) 
   this->resetIterations();

   this->setResidue( this->getConvergenceResidue() + 1.0 );



   this->refreshSolverMonitor();



   /****

    * Start the main loop

    */
@@ -196,7 +194,6 @@ bool Merson< Problem, SolverMonitor >::solve( DofVectorPointer& u ) 
         if( ! this->nextIteration() )

            return false;

      }

      this->refreshSolverMonitor();



      /****

       * Compute the new time step.
@@ -221,12 +218,8 @@ bool Merson< Problem, SolverMonitor >::solve( DofVectorPointer& u ) 
      //cerr << "this->getConvergenceResidue() = " << this->getConvergenceResidue() << std::endl;

      if( time >= this->getStopTime() ||

          ( this->getConvergenceResidue() != 0.0 && this->getResidue() < this->getConvergenceResidue() ) )

      {

         this->refreshSolverMonitor();

         return true;

   }

   }

   this->refreshSolverMonitor();

   return this->checkConvergence();



};

src/TNL/Solvers/IterativeSolver.h

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ class IterativeSolver 
      /**

       * \brief Refreshes the solver monitor.

       */

      void refreshSolverMonitor();

      //void refreshSolverMonitor();



   protected:

      Index maxIterations = 1000000000;

src/TNL/Solvers/IterativeSolver.hpp

+3 −4
Original line number Diff line number Diff line
@@ -127,8 +127,6 @@ bool 
IterativeSolver< Real, Index, SolverMonitor >::

checkNextIteration()

{

   this->refreshSolverMonitor();



   if( std::isnan( this->getResidue() ) ||

       this->getIterations() > this->getMaxIterations()  ||

       ( this->getResidue() > this->getDivergenceResidue() && this->getIterations() >= this->getMinIterations() ) ||
@@ -236,6 +234,7 @@ IterativeSolver< Real, Index, SolverMonitor >:: 
setRefreshRate( const Index& refreshRate )

{

   this->refreshRate = refreshRate;

   this->solverMonitor->setRefreshRate( this->refreshRate );

}



template< typename Real, typename Index, typename SolverMonitor >
@@ -246,7 +245,7 @@ setSolverMonitor( SolverMonitorType& solverMonitor ) 
   this->solverMonitor = &solverMonitor;

}



template< typename Real, typename Index, typename SolverMonitor >

/*template< typename Real, typename Index, typename SolverMonitor >

void

IterativeSolver< Real, Index, SolverMonitor >::

refreshSolverMonitor()
@@ -257,7 +256,7 @@ refreshSolverMonitor() 
      this->solverMonitor->setResidue( this->getResidue() );

      this->solverMonitor->setRefreshRate( this->refreshRate );

   }

}

}*/



} // namespace Solvers

} // namespace TNL

src/TNL/Solvers/Linear/BICGStab.hpp

+0 −1
Original line number Diff line number Diff line
@@ -119,7 +119,6 @@ solve( ConstVectorViewType b, VectorViewType x ) 
      }

   }



   this->refreshSolverMonitor();

   return this->checkConvergence();

}