From 183654ee5482797f9a770a94efb8d2f437eb7886 Mon Sep 17 00:00:00 2001 From: linpz Date: Mon, 26 Apr 2021 23:01:46 +0800 Subject: [PATCH 1/2] 1. fix bug of operator*(const double&, const Matrix3&) 2. delete default parameters in Matrix3() --- ABACUS.develop/source/src_global/matrix3.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ABACUS.develop/source/src_global/matrix3.h b/ABACUS.develop/source/src_global/matrix3.h index 7729fe5cde..10f475849e 100644 --- a/ABACUS.develop/source/src_global/matrix3.h +++ b/ABACUS.develop/source/src_global/matrix3.h @@ -20,9 +20,10 @@ class Matrix3 double e11, e12, e13, e21, e22, e23, e31, e32, e33; /* Constructors and destructor */ - Matrix3(const double &r11 = 1,const double &r12 = 0,const double &r13 = 0, - const double &r21 = 0,const double &r22 = 1,const double &r23 = 0, - const double &r31 = 0,const double &r32 = 0,const double &r33 = 1); + Matrix3(){ Identity(); } + Matrix3(const double &r11,const double &r12,const double &r13, + const double &r21,const double &r22,const double &r23, + const double &r31,const double &r32,const double &r33); void Reset(void); void Identity(void); @@ -46,7 +47,7 @@ Matrix3 operator -(const Matrix3 &m1, const Matrix3 &m2); //m1-m2 Matrix3 operator /(const Matrix3 &m,const double &s); //m/s Matrix3 operator *(const Matrix3 &m1,const Matrix3 &m2); //m1*m2 Matrix3 operator *(const Matrix3 &m,const double &s); //m*s -Matrix3 operator *(double &s, const Matrix3 &m); //s*m +Matrix3 operator *(const double &s, const Matrix3 &m); //s*m template Vector3 operator *(const Matrix3 &m, const Vector3 &u); //m*u // Peize Lin change Vector3 2017-01-10 template Vector3 operator *(const Vector3 &u, const Matrix3 &m); //u*m // Peize Lin change Vector3 2017-01-10 From 1d9d65a014a9efd3d0aea5400e6460db28663b1d Mon Sep 17 00:00:00 2001 From: linpz Date: Mon, 26 Apr 2021 23:10:55 +0800 Subject: [PATCH 2/2] 1. delete Matrix3::Reset() --- ABACUS.develop/source/src_global/matrix3.cpp | 7 ------- ABACUS.develop/source/src_global/matrix3.h | 1 - 2 files changed, 8 deletions(-) diff --git a/ABACUS.develop/source/src_global/matrix3.cpp b/ABACUS.develop/source/src_global/matrix3.cpp index 29371c0a77..afe7411443 100644 --- a/ABACUS.develop/source/src_global/matrix3.cpp +++ b/ABACUS.develop/source/src_global/matrix3.cpp @@ -9,13 +9,6 @@ Matrix3::Matrix3(const double &r11, const double &r12, const double &r13, e31 = r31;e32 = r32;e33 = r33; } -void Matrix3::Reset(void) -{ - e11 = 1;e12 = 0;e13 = 0; - e21 = 0;e22 = 1;e23 = 0; - e31 = 0;e32 = 0;e33 = 1; -} - void Matrix3::Identity(void) { e11 = 1;e12 = 0;e13 = 0; diff --git a/ABACUS.develop/source/src_global/matrix3.h b/ABACUS.develop/source/src_global/matrix3.h index 10f475849e..966e209030 100644 --- a/ABACUS.develop/source/src_global/matrix3.h +++ b/ABACUS.develop/source/src_global/matrix3.h @@ -25,7 +25,6 @@ class Matrix3 const double &r21,const double &r22,const double &r23, const double &r31,const double &r32,const double &r33); - void Reset(void); void Identity(void); void Zero(void); double Det(void) const ;