From 19c4afb4b184512919b5cedaf46a1b7feca49aba Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Thu, 3 Apr 2014 09:18:09 +0200
Subject: [PATCH] Rename multi() -> multiply() in all matrix classes.
---
MathLib/LinAlg/Dense/GlobalDenseMatrix-impl.h | 2 +-
MathLib/LinAlg/Dense/GlobalDenseMatrix.h | 2 +-
MathLib/LinAlg/Lis/LisMatrix.cpp | 2 +-
MathLib/LinAlg/Lis/LisMatrix.h | 2 +-
MathLib/LinAlg/PETSc/PETScMatrix.h | 2 +-
Tests/MathLib/TestGlobalMatrixInterface.cpp | 6 +++---
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/MathLib/LinAlg/Dense/GlobalDenseMatrix-impl.h b/MathLib/LinAlg/Dense/GlobalDenseMatrix-impl.h
index 86e08afaa89..6a8fc64bdaa 100644
--- a/MathLib/LinAlg/Dense/GlobalDenseMatrix-impl.h
+++ b/MathLib/LinAlg/Dense/GlobalDenseMatrix-impl.h
@@ -85,7 +85,7 @@ GlobalDenseMatrix<FP_TYPE, IDX_TYPE>::add(std::vector<IDX_TYPE> const& row_pos,
template<typename FP_TYPE, typename IDX_TYPE>
void
-GlobalDenseMatrix<FP_TYPE, IDX_TYPE>::multi( const DenseVector<FP_TYPE> &x, DenseVector<FP_TYPE> &y) const
+GlobalDenseMatrix<FP_TYPE, IDX_TYPE>::multiply( const DenseVector<FP_TYPE> &x, DenseVector<FP_TYPE> &y) const
{
this->axpy (1.0, &x[0], 0.0, &y[0]);
}
diff --git a/MathLib/LinAlg/Dense/GlobalDenseMatrix.h b/MathLib/LinAlg/Dense/GlobalDenseMatrix.h
index a8ca12a5a02..b81ca69d695 100644
--- a/MathLib/LinAlg/Dense/GlobalDenseMatrix.h
+++ b/MathLib/LinAlg/Dense/GlobalDenseMatrix.h
@@ -94,7 +94,7 @@ public:
FP_TYPE fkt = static_cast<FP_TYPE>(1.0));
/// y = mat * x
- void multi( const DenseVector<FP_TYPE> &x, DenseVector<FP_TYPE> &y) const;
+ void multiply( const DenseVector<FP_TYPE> &x, DenseVector<FP_TYPE> &y) const;
};
} // end namespace MathLib
diff --git a/MathLib/LinAlg/Lis/LisMatrix.cpp b/MathLib/LinAlg/Lis/LisMatrix.cpp
index e2950bc41a7..a2b09af2bea 100644
--- a/MathLib/LinAlg/Lis/LisMatrix.cpp
+++ b/MathLib/LinAlg/Lis/LisMatrix.cpp
@@ -101,7 +101,7 @@ double LisMatrix::getMaxDiagCoeff()
return abs_max_entry;
}
-void LisMatrix::multi(const LisVector &x, LisVector &y) const
+void LisMatrix::multiply(const LisVector &x, LisVector &y) const
{
if (!_is_assembled)
throw std::logic_error("LisMatrix::matvec(): matrix not assembled.");
diff --git a/MathLib/LinAlg/Lis/LisMatrix.h b/MathLib/LinAlg/Lis/LisMatrix.h
index 42ad78b7978..12b325db2b0 100644
--- a/MathLib/LinAlg/Lis/LisMatrix.h
+++ b/MathLib/LinAlg/Lis/LisMatrix.h
@@ -82,7 +82,7 @@ public:
LIS_MATRIX& getRawMatrix() { return _AA; }
/// y = mat * x
- void multi(const LisVector &x, LisVector &y) const;
+ void multiply(const LisVector &x, LisVector &y) const;
/// Add sub-matrix at positions \c row_pos and same column positions as the
/// given row positions.
diff --git a/MathLib/LinAlg/PETSc/PETScMatrix.h b/MathLib/LinAlg/PETSc/PETScMatrix.h
index 97bd9535411..7c73621961e 100644
--- a/MathLib/LinAlg/PETSc/PETScMatrix.h
+++ b/MathLib/LinAlg/PETSc/PETScMatrix.h
@@ -127,7 +127,7 @@ class PETScMatrix
\param vec_r The result vector, e.g. \f$ y \f$
Both of the two arguments must be created prior to be used.
*/
- void multi(const PETScVector &vec, PETScVector &vec_r)
+ void multiply(const PETScVector &vec, PETScVector &vec_r)
{
MatMult(_A, vec.getData(), vec_r.getData() );
}
diff --git a/Tests/MathLib/TestGlobalMatrixInterface.cpp b/Tests/MathLib/TestGlobalMatrixInterface.cpp
index 10679404cca..04e1fe86375 100644
--- a/Tests/MathLib/TestGlobalMatrixInterface.cpp
+++ b/Tests/MathLib/TestGlobalMatrixInterface.cpp
@@ -95,7 +95,7 @@ void checkGlobalMatrixInterfaceMPI(T_MATRIX &m, T_VECTOR &v)
v = 1.;
const bool deep_copy = false;
T_VECTOR y(v, deep_copy);
- m.multi(v, y);
+ m.multiply(v, y);
ASSERT_EQ(sqrt(3*(3*3 + 7*7)), y.getNorm());
@@ -105,7 +105,7 @@ void checkGlobalMatrixInterfaceMPI(T_MATRIX &m, T_VECTOR &v)
// add a value
m.add(2 * mrank+1, 2 * mrank+1, 5.0);
MathLib::finalizeMatrixAssembly(m);
- m.multi(v, y);
+ m.multiply(v, y);
ASSERT_EQ(sqrt((3*7*7 + 3*12*12)), y.getNorm());
@@ -154,7 +154,7 @@ void checkGlobalRectangularMatrixInterfaceMPI(T_MATRIX &m, T_VECTOR &v)
// Multiply by a vector
v = 1.;
T_VECTOR y(m.getNRows());
- m.multi(v, y);
+ m.multiply(v, y);
ASSERT_NEAR(6.*sqrt(6.), y.getNorm(), 1.e-10);
}
--
GitLab