OSDN > Desarrollador > ktns > Chamber > MolDS > Commit

MolDS
Fork

(Original repository, No fork origin)

Commit

Revisión	a5ee68727464319e766bd8750162d295d73915e4 (tree)
Tiempo	2013-01-22 04:15:56
Autor	Katsuhiko Nishimra <ktns.87@gmai...>
Commiter	Katsuhiko Nishimra

Fix typo.

--- a/src/base/MathUtilities.cpp

+++ b/src/base/MathUtilities.cpp

		@@ -88,40 +88,40 @@ template <typename T> T min(T a, T b){
88	88	}
89	89
90	90	// rotating matrix
91		-void CalcRotatingMatrix(double matrix[][3], double sita, CartesianType cartesianType){
	91	+void CalcRotatingMatrix(double matrix[][3], double theta, CartesianType cartesianType){
92	92	if(cartesianType == XAxis){
93	93	matrix[0][0] = 1.0;
94	94	matrix[0][1] = 0.0;
95	95	matrix[0][2] = 0.0;
96	96
97	97	matrix[1][0] = 0.0;
98		- matrix[1][1] = cos(sita);
99		- matrix[1][2] = sin(sita);
	98	+ matrix[1][1] = cos(theta);
	99	+ matrix[1][2] = sin(theta);
100	100
101	101	matrix[2][0] = 0.0;
102		- matrix[2][1] = -sin(sita);
103		- matrix[2][2] = cos(sita);
	102	+ matrix[2][1] = -sin(theta);
	103	+ matrix[2][2] = cos(theta);
104	104	}
105	105	else if(cartesianType == YAxis){
106		- matrix[0][0] = cos(sita);
	106	+ matrix[0][0] = cos(theta);
107	107	matrix[0][1] = 0.0;
108		- matrix[0][2] = -sin(sita);
	108	+ matrix[0][2] = -sin(theta);
109	109
110	110	matrix[1][0] = 0.0;
111	111	matrix[1][1] = 1.0;
112	112	matrix[1][2] = 0.0;
113	113
114		- matrix[2][0] = sin(sita);
	114	+ matrix[2][0] = sin(theta);
115	115	matrix[2][1] = 0.0;
116		- matrix[2][2] = cos(sita);
	116	+ matrix[2][2] = cos(theta);
117	117	}
118	118	else if(cartesianType == ZAxis){
119		- matrix[0][0] = cos(sita);
120		- matrix[0][1] = sin(sita);
	119	+ matrix[0][0] = cos(theta);
	120	+ matrix[0][1] = sin(theta);
121	121	matrix[0][2] = 0.0;
122	122
123		- matrix[1][0] = -sin(sita);
124		- matrix[1][1] = cos(sita);
	123	+ matrix[1][0] = -sin(theta);
	124	+ matrix[1][1] = cos(theta);
125	125	matrix[1][2] = 0.0;
126	126
127	127	matrix[2][0] = 0.0;

--- a/src/base/MathUtilities.h

+++ b/src/base/MathUtilities.h

		@@ -28,7 +28,7 @@ template <typename T> T Max(T a, T b);
28	28	// min
29	29	template <typename T> T min(T a, T b);
30	30	// rotating matrix
31		-void CalcRotatingMatrix(double matrix[][3], double sita, CartesianType cartesianType);
	31	+void CalcRotatingMatrix(double matrix[][3], double theta, CartesianType cartesianType);
32	32	// calculate determinant of the matrix. Note taht the matrix will be destroid
33	33	double GetDeterminant(double** matrix, int dim);
34	34	}