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

Renaming mBaseMatrix to tnlBaseMatrix.

parent c088de7d

src/matrix/Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ headers = \ 
      mMatrix.h \

	  mCSRMatrix.h \

	  mFullMatrix.h \

	  mBaseMatrix.h \

	  tnlBaseMatrix.h \

	  mMatrixSolver.h \

	  mPETSCMatrix.h \

	  mPETSCSolver.h \
@@ -17,7 +17,7 @@ headers = \ 
	  mILUPreconditioner.h \

	  mPETSCPreconditioner.h



sources = mBaseMatrix.cpp 

sources = tnlBaseMatrix.cpp 



libtnlmatrixincludedir = $(TNL_INCLUDE_DIR)/matrix

libtnlmatrixinclude_HEADERS = $(headers)

src/matrix/mBICGSolver.h

+4 −4
Original line number Diff line number Diff line
@@ -31,12 +31,12 @@ template< typename T > class mBICGSolver : public mMatrixSolver< T > 
   {

   };



   void SetTransposeMatrix( mBaseMatrix< T >* _A_T )

   void SetTransposeMatrix( tnlBaseMatrix< T >* _A_T )

   {

      A_T = _A_T;

   };

   

   bool Solve( const mBaseMatrix< T >& A,

   bool Solve( const tnlBaseMatrix< T >& A,

               const T* b,

               T* x, 

               const double& max_residue,
@@ -150,7 +150,7 @@ template< typename T > class mBICGSolver : public mMatrixSolver< T > 


   protected:



   double GetResidue( const mBaseMatrix< T >& A,

   double GetResidue( const tnlBaseMatrix< T >& A,

                      const T* b,

                      const T* x,

                      const T& b_norm,
@@ -205,7 +205,7 @@ template< typename T > class mBICGSolver : public mMatrixSolver< T > 


   T *r, *r_ast, *r_new, *r_ast_new, *p, *p_ast, *tmp;



   mBaseMatrix< T >* A_T;

   tnlBaseMatrix< T >* A_T;



   long int size;

};

src/matrix/mBICGStabSolver.h

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ template< typename T > class mBICGStabSolver : public mMatrixSolver< T > 
   {

   };



   bool Solve( const mBaseMatrix< T >& A,

   bool Solve( const tnlBaseMatrix< T >& A,

               const T* b,

               T* x, 

               const double& max_residue,
@@ -185,7 +185,7 @@ template< typename T > class mBICGStabSolver : public mMatrixSolver< T > 


   protected:



   double GetResidue( const mBaseMatrix< T >& A,

   double GetResidue( const tnlBaseMatrix< T >& A,

                      const T* b,

                      const T* x,

                      const T& b_norm,

src/matrix/mCGSolver.h

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ template< typename T > class mCGSolver : public mMatrixSolver< T > 
   : r( 0 ), new_r( 0 ), p( 0 ), Ap( 0 ), size( 0 )

   {};

   

   bool Solve( const mBaseMatrix< T >& A,

   bool Solve( const tnlBaseMatrix< T >& A,

               const T* b,

               T* x, 

               const double& max_residue,
@@ -118,7 +118,7 @@ template< typename T > class mCGSolver : public mMatrixSolver< T > 


   protected:



   double GetResidue( const mBaseMatrix< T >& A,

   double GetResidue( const tnlBaseMatrix< T >& A,

                      const T* b,

                      const T* x,

                      const T& b_norm,

src/matrix/mCSRMatrix.h

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include <iomanip>

#include <assert.h>

#include <core/mfuncs.h>

#include <matrix/mBaseMatrix.h>

#include <matrix/tnlBaseMatrix.h>

#include <debug/tnlDebug.h>



//! Structure for keeping single element of the CSR matrix
@@ -76,7 +76,7 @@ struct mCSRMatrixRowInfo 
    stored in param allocation_segment_size.

    \author Tomas Oberhuber.

 */

template< typename T > class mCSRMatrix : public mBaseMatrix< T >

template< typename T > class mCSRMatrix : public tnlBaseMatrix< T >

{

   enum csr_operation { set, add };