diff --git a/MathLib/LinAlg/Dense/GlobalDenseMatrix-impl.h b/MathLib/LinAlg/Dense/GlobalDenseMatrix-impl.h index 86e08afaa896eb2df1d1db65097900300d3a26ad..6a8fc64bdaa1242a620b5f709ba80381217e9dee 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 a8ca12a5a027926192c0e155d6cf219797580d9c..b81ca69d69545ce011abd6a5835546e0972274bd 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 e2950bc41a78f73859e46f227674359ef085ff7b..a2b09af2bea3950c128a3891f2f391a676978e32 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 42ad78b79783efce81c9488d2a0b04f09dfffa28..12b325db2b04b064c1602a043838d0174bbaf629 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 97bd9535411c9392e7484e67200a3f17347a75b4..7c73621961e27fe152f09848216587223606ddc1 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 10679404ccab1c43ae0e9b8cea83666001d80c60..04e1fe8637506b36b252e0e83d1082d67a84f47b 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); }