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

Renamed CompressedRowsLengths to CompressedRowLengths.

parent 77e944c2

examples/advection/advectionProblem_impl.h

+5 −5
Original line number Diff line number Diff line
@@ -198,17 +198,17 @@ setupLinearSystem( const MeshPointer& mesh, 
                   Matrix& matrix )

{

   const IndexType dofs = this->getDofs( mesh );

   typedef typename Matrix::ObjectType::CompressedRowsLengthsVector CompressedRowsLengthsVectorType;

   SharedPointer< CompressedRowsLengthsVectorType > rowLengths;

   typedef typename Matrix::ObjectType::CompressedRowLengthsVector CompressedRowLengthsVectorType;

   SharedPointer< CompressedRowLengthsVectorType > rowLengths;

   if( ! rowLengths->setSize( dofs ) )

      return false;

   Matrices::MatrixSetter< MeshType, DifferentialOperator, BoundaryCondition, CompressedRowsLengthsVectorType > matrixSetter;

   matrixSetter.template getCompressedRowsLengths< typename Mesh::Cell >( mesh,

   Matrices::MatrixSetter< MeshType, DifferentialOperator, BoundaryCondition, CompressedRowLengthsVectorType > matrixSetter;

   matrixSetter.template getCompressedRowLengths< typename Mesh::Cell >( mesh,

                                                                          differentialOperatorPointer,

                                                                          boundaryConditionPointer,

                                                                          rowLengths );

   matrix->setDimensions( dofs, dofs );

   if( ! matrix->setCompressedRowsLengths( *rowLengths ) )

   if( ! matrix->setCompressedRowLengths( *rowLengths ) )

      return false;

   return true;

}

examples/inviscid-flow/1d/eulerProblem_impl.h

+5 −5
Original line number Diff line number Diff line
@@ -168,17 +168,17 @@ setupLinearSystem( const MeshPointer& mesh, 
                   Matrix& matrix )

{

/*   const IndexType dofs = this->getDofs( mesh );

   typedef typename Matrix::CompressedRowsLengthsVector CompressedRowsLengthsVectorType;

   CompressedRowsLengthsVectorType rowLengths;

   typedef typename Matrix::CompressedRowLengthsVector CompressedRowLengthsVectorType;

   CompressedRowLengthsVectorType rowLengths;

   if( ! rowLengths.setSize( dofs ) )

      return false;

   MatrixSetter< MeshType, DifferentialOperator, BoundaryCondition, CompressedRowsLengthsVectorType > matrixSetter;

   matrixSetter.template getCompressedRowsLengths< typename Mesh::Cell >( mesh,

   MatrixSetter< MeshType, DifferentialOperator, BoundaryCondition, CompressedRowLengthsVectorType > matrixSetter;

   matrixSetter.template getCompressedRowLengths< typename Mesh::Cell >( mesh,

                                                                          differentialOperator,

                                                                          boundaryCondition,

                                                                          rowLengths );

   matrix.setDimensions( dofs, dofs );

   if( ! matrix.setCompressedRowsLengths( rowLengths ) )

   if( ! matrix.setCompressedRowLengths( rowLengths ) )

      return false;*/

   return true;

}

examples/inviscid-flow/2d/eulerProblem_impl.h

+5 −5
Original line number Diff line number Diff line
@@ -169,17 +169,17 @@ setupLinearSystem( const MeshPointer& mesh, 
                   Matrix& matrix )

{

/*   const IndexType dofs = this->getDofs( mesh );

   typedef typename Matrix::CompressedRowsLengthsVector CompressedRowsLengthsVectorType;

   CompressedRowsLengthsVectorType rowLengths;

   typedef typename Matrix::CompressedRowLengthsVector CompressedRowLengthsVectorType;

   CompressedRowLengthsVectorType rowLengths;

   if( ! rowLengths.setSize( dofs ) )

      return false;

   MatrixSetter< MeshType, DifferentialOperator, BoundaryCondition, CompressedRowsLengthsVectorType > matrixSetter;

   matrixSetter.template getCompressedRowsLengths< typename Mesh::Cell >( mesh,

   MatrixSetter< MeshType, DifferentialOperator, BoundaryCondition, CompressedRowLengthsVectorType > matrixSetter;

   matrixSetter.template getCompressedRowLengths< typename Mesh::Cell >( mesh,

                                                                          differentialOperator,

                                                                          boundaryCondition,

                                                                          rowLengths );

   matrix.setDimensions( dofs, dofs );

   if( ! matrix.setCompressedRowsLengths( rowLengths ) )

   if( ! matrix.setCompressedRowLengths( rowLengths ) )

      return false;*/

   return true;

}

src/TNL/Matrices/CSR.h

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ class CSR : public Sparse< Real, Device, Index > 
   typedef Real RealType;

   typedef Device DeviceType;

   typedef Index IndexType;

   typedef typename Sparse< RealType, DeviceType, IndexType >:: CompressedRowsLengthsVector CompressedRowsLengthsVector;

   typedef typename Sparse< RealType, DeviceType, IndexType >:: CompressedRowLengthsVector CompressedRowLengthsVector;

   typedef CSR< Real, Device, Index > ThisType;

   typedef CSR< Real, Devices::Host, Index > HostType;

   typedef CSR< Real, Devices::Cuda, Index > CudaType;
@@ -55,7 +55,7 @@ class CSR : public Sparse< Real, Device, Index > 
   bool setDimensions( const IndexType rows,

                       const IndexType columns );



   bool setCompressedRowsLengths( const CompressedRowsLengthsVector& rowLengths );

   bool setCompressedRowLengths( const CompressedRowLengthsVector& rowLengths );



   IndexType getRowLength( const IndexType row ) const;

src/TNL/Matrices/CSR_impl.h

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ bool CSR< Real, Device, Index >::setDimensions( const IndexType rows, 
template< typename Real,

          typename Device,

          typename Index >

bool CSR< Real, Device, Index >::setCompressedRowsLengths( const CompressedRowsLengthsVector& rowLengths )

bool CSR< Real, Device, Index >::setCompressedRowLengths( const CompressedRowLengthsVector& rowLengths )

{

   /****

    * Compute the rows pointers. The last one is