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

Merge branch 'master' of geraldine.fjfi.cvut.cz:/local/projects/tnl/tnl

parents bec0a4cd 615aa589

src/core/tnlHost.h

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 


#include <core/tnlDevice.h>

#include <core/tnlString.h>

#include <core/implementation/memory-functions.h>



class tnlHost

{

src/solvers/tnlSORSolver.h

+2 −2
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ bool tnlSORSolverOld< Real, Device, Index > :: solve( const tnlMatrix< Real, Dev 
                              size );

      if( this -> iteration % 10 == 0 )

      {

         this -> residue = getResidue( A, b, x, bNorm );

         this -> residue = this -> getResidue( A, b, x, bNorm );

         if( this -> verbosity > 1 )

            this -> printOut();

      }
@@ -111,7 +111,7 @@ bool tnlSORSolverOld< Real, Device, Index > :: solve( const tnlMatrix< Real, Dev 
   }

   if( this -> verbosity > 0 )

   {

      this -> residue = getResidue( A, b, x, bNorm );

      this -> residue = this -> getResidue( A, b, x, bNorm );

      this -> printOut();

   }

   if( this -> iteration <= max_iterations ) return true;