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

Renaming nonEmptyRows to nonemptyRows in tridiagonal matrix indexer.

parent 43106489

src/TNL/Matrices/TridiagonalMatrixView.hpp

+2 −2
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ void 
TridiagonalMatrixView< Real, Device, Index, RowMajorOrder >::

allRowsReduction( Fetch& fetch, Reduce& reduce, Keep& keep, const FetchReal& zero ) const

{

   this->rowsReduction( 0, this->indexer.getNonEmptyRowsCount(), fetch, reduce, keep, zero );

   this->rowsReduction( 0, this->indexer.getNonemptyRowsCount(), fetch, reduce, keep, zero );

}



template< typename Real,
@@ -418,7 +418,7 @@ void 
TridiagonalMatrixView< Real, Device, Index, RowMajorOrder >::

forAllRows( Function& function )

{

   this->forRows( 0, this->indexer.getNonEmptyRowsCount(), function );

   this->forRows( 0, this->indexer.getNonemptyRowsCount(), function );

}



template< typename Real,

src/TNL/Matrices/details/TridiagonalMatrixIndexer.h

+9 −9
Original line number Diff line number Diff line
@@ -26,21 +26,21 @@ class TridiagonalMatrixIndexer 


      __cuda_callable__

      TridiagonalMatrixIndexer()

      : rows( 0 ), columns( 0 ), nonEmptyRows( 0 ){};

      : rows( 0 ), columns( 0 ), nonemptyRows( 0 ){};



      __cuda_callable__

      TridiagonalMatrixIndexer( const IndexType& rows, const IndexType& columns )

      : rows( rows ), columns( columns ), nonEmptyRows( TNL::min( rows, columns ) + ( rows > columns ) ) {};

      : rows( rows ), columns( columns ), nonemptyRows( TNL::min( rows, columns ) + ( rows > columns ) ) {};



      __cuda_callable__

      TridiagonalMatrixIndexer( const TridiagonalMatrixIndexer& indexer )

      : rows( indexer.rows ), columns( indexer.columns ), nonEmptyRows( indexer.nonEmptyRows ) {};

      : rows( indexer.rows ), columns( indexer.columns ), nonemptyRows( indexer.nonemptyRows ) {};



      void setDimensions( const IndexType& rows, const IndexType& columns )

      {

         this->rows = rows;

         this->columns = columns;

         this->nonEmptyRows = min( rows, columns ) + ( rows > columns );

         this->nonemptyRows = min( rows, columns ) + ( rows > columns );

      };



      __cuda_callable__
@@ -65,9 +65,9 @@ class TridiagonalMatrixIndexer 
      const IndexType& getColumns() const { return this->columns; };



      __cuda_callable__

      const IndexType& getNonEmptyRowsCount() const { return this->nonEmptyRows; };

      const IndexType& getNonemptyRowsCount() const { return this->nonemptyRows; };

      __cuda_callable__

      IndexType getStorageSize() const { return 3 * this->nonEmptyRows; };

      IndexType getStorageSize() const { return 3 * this->nonemptyRows; };



      __cuda_callable__

      IndexType getGlobalIndex( const Index rowIdx, const Index localIdx ) const
@@ -80,12 +80,12 @@ class TridiagonalMatrixIndexer 
         if( RowMajorOrder )

            return 3 * rowIdx + localIdx;

         else

            return localIdx * nonEmptyRows + rowIdx;

            return localIdx * nonemptyRows + rowIdx;

      };



      protected:



         IndexType rows, columns, nonEmptyRows;

         IndexType rows, columns, nonemptyRows;

};

      } //namespace details

   } // namespace Materices