Commit 5d490535 authored by Vít Hanousek's avatar Vít Hanousek
Browse files

Merge branch 'mpi-explosive' of geraldine.fjfi.cvut.cz:/local/projects/tnl/tnl into mpi-explosive

parents aca356bd d46ee098

src/TNL/Solvers/IterativeSolverMonitor.h

+2 −1
Original line number Diff line number Diff line
@@ -47,7 +47,8 @@ protected: 


   std::atomic_bool saved;



   RealType time, saved_time, timeStep, saved_timeStep, residue, saved_residue, elapsed_time_before_refresh;

   RealType time, saved_time, timeStep, saved_timeStep, residue, saved_residue, elapsed_time_before_refresh, last_mlups;

   //TODO: Move MLUPS to LBM solver only i.e create solver monitor for LBM



   IndexType iterations, saved_iterations, iterations_before_refresh;

src/TNL/Solvers/IterativeSolverMonitor_impl.h

+10 −2
Original line number Diff line number Diff line
@@ -168,10 +168,18 @@ void IterativeSolverMonitor< Real, Index > :: refresh() 
         print_item( real_to_string( (saved) ? saved_residue : residue, 5 ), 12 );

      }



      if( nodesPerIteration ) {

      if( nodesPerIteration ) // otherwise MLUPS: 0 is printed

      {

         const RealType mlups = nodesPerIteration * (iterations - iterations_before_refresh) / (getElapsedTime() - elapsed_time_before_refresh) * 1e-6;

         //std::cerr << std::endl << " iterations - iterations_before_refresh = " << iterations - iterations_before_refresh

         //          << " getElapsedTime() - elapsed_time_before_refresh = " << getElapsedTime() - elapsed_time_before_refresh << std::endl;

         print_item( " MLUPS:", 0 );

         if( mlups > 0 )

         {

            print_item( real_to_string( mlups, 5 ), 7 );

            last_mlups = mlups;

         }

         else print_item( real_to_string( last_mlups, 5 ), 7 );

      }

      iterations_before_refresh = iterations;

      elapsed_time_before_refresh = getElapsedTime();