From 7104d153305e1f8e3ee9aae3ead38db516cb5577 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Oberhuber?= <oberhuber.tomas@gmail.com>
Date: Sat, 11 Jan 2020 13:50:25 +0100
Subject: [PATCH] Renaming Matrix::getNumberOfMetrixElements to
getAllocatedElementdCount.
---
src/Python/pytnl/tnl/SparseMatrix.h | 2 +-
src/TNL/Matrices/Legacy/Sparse_impl.h | 2 +-
src/TNL/Matrices/MatrixReader_impl.h | 2 +-
src/TNL/Matrices/SparseMatrix.hpp | 3 +++
4 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/Python/pytnl/tnl/SparseMatrix.h b/src/Python/pytnl/tnl/SparseMatrix.h
index 03ec5814c4..b4cc0fc1a5 100644
--- a/src/Python/pytnl/tnl/SparseMatrix.h
+++ b/src/Python/pytnl/tnl/SparseMatrix.h
@@ -72,7 +72,7 @@ void export_Matrix( py::module & m, const char* name )
.def("getCompressedRowLengths", _getCompressedRowLengths)
// TODO: export for more types
.def("setLike", &Matrix::template setLike< typename Matrix::RealType, typename Matrix::DeviceType, typename Matrix::IndexType >)
- .def("getNumberOfMatrixElements", &Matrix::getNumberOfMatrixElements)
+ .def("getAllocatedElementsCount", &Matrix::getAllocatedElementsCount)
.def("getNumberOfNonzeroMatrixElements", &Matrix::getNumberOfNonzeroMatrixElements)
.def("reset", &Matrix::reset)
.def("getRows", &Matrix::getRows)
diff --git a/src/TNL/Matrices/Legacy/Sparse_impl.h b/src/TNL/Matrices/Legacy/Sparse_impl.h
index 889d92e627..3e47944122 100644
--- a/src/TNL/Matrices/Legacy/Sparse_impl.h
+++ b/src/TNL/Matrices/Legacy/Sparse_impl.h
@@ -33,7 +33,7 @@ template< typename Real,
void Sparse< Real, Device, Index >::setLike( const Sparse< Real2, Device2, Index2 >& matrix )
{
Matrix< Real, Device, Index >::setLike( matrix );
- this->allocateMatrixElements( matrix.getNumberOfMatrixElements() );
+ this->allocateMatrixElements( matrix.getAllocatedElementsCount() );
}
diff --git a/src/TNL/Matrices/MatrixReader_impl.h b/src/TNL/Matrices/MatrixReader_impl.h
index 476a7327eb..a80d002837 100644
--- a/src/TNL/Matrices/MatrixReader_impl.h
+++ b/src/TNL/Matrices/MatrixReader_impl.h
@@ -340,7 +340,7 @@ void MatrixReader< Matrix >::readMatrixElementsFromMtxFile( std::istream& file,
long int fileSize = file.tellg();
timer.stop();
if( verbose )
- std::cout << " Reading the matrix elements ... " << processedElements << " / " << matrix.getNumberOfMatrixElements()
+ std::cout << " Reading the matrix elements ... " << processedElements << " / " << matrix.getAllocatedElementsCount()
<< " -> " << timer.getRealTime()
<< " sec. i.e. " << fileSize / ( timer.getRealTime() * ( 1 << 20 )) << "MB/s." << std::endl;
}
diff --git a/src/TNL/Matrices/SparseMatrix.hpp b/src/TNL/Matrices/SparseMatrix.hpp
index 6189d43d37..3f5636bb6a 100644
--- a/src/TNL/Matrices/SparseMatrix.hpp
+++ b/src/TNL/Matrices/SparseMatrix.hpp
@@ -412,6 +412,9 @@ vectorProduct( const InVector& inVector,
const RealType& matrixMultiplicator,
const RealType& inVectorAddition ) const
{
+ TNL_ASSERT_EQ( this->getColumns(), inVector.getSize(), "Matrix columns do not fit with input vector." );
+ TNL_ASSERT_EQ( this->getRows(), outVector.getSize(), "Matrix rows do not fit with output vector." );
+
const auto inVectorView = inVector.getConstView();
auto outVectorView = outVector.getView();
const auto valuesView = this->values.getConstView();
--
GitLab