Skip to content

Peize fix a bug in Matrix3, found by Jiyuyang #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mohanchen merged 2 commits into from
Apr 26, 2021
Merged

Peize fix a bug in Matrix3, found by Jiyuyang #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
183654e
1. fix bug of operator*(const double&, const Matrix3&)
PeizeLin Apr 26, 2021
1d9d65a
1. delete Matrix3::Reset()
PeizeLin Apr 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions ABACUS.develop/source/src_global/matrix3.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions ABACUS.develop/source/src_global/matrix3.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ 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);
void Zero(void);
double Det(void) const ;
Expand All @@ -46,7 +46,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<typename T> Vector3<double> operator *(const Matrix3 &m, const Vector3<T> &u); //m*u // Peize Lin change Vector3<T> 2017-01-10
template<typename T> Vector3<double> operator *(const Vector3<T> &u, const Matrix3 &m); //u*m // Peize Lin change Vector3<T> 2017-01-10

Expand Down