Révision | 5f568d7ec6abe2134da22ea8f133666c21f68d18 (tree) |
---|---|
l'heure | 2011-02-07 14:03:08 |
Auteur | Mikiya Fujii <mikiya.fujii@gmai...> |
Commiter | Mikiya Fujii |
OpneMP in Cndo2::CalcGammaAB is a little bit modified.
git-svn-id: https://svn.sourceforge.jp/svnroot/molds/MolDS/trunk@89 1136aad2-a195-0410-b898-f5ea1d11b9d8
@@ -7,6 +7,7 @@ | ||
7 | 7 | #include<time.h> |
8 | 8 | #include<list> |
9 | 9 | #include<vector> |
10 | +#include<omp.h> | |
10 | 11 | #include"base/Utilities.h" |
11 | 12 | #include"base/MolDSException.h" |
12 | 13 | #include"base/Enums.h" |
@@ -965,7 +965,7 @@ void Cndo2::CalcGammaAB(double** gammaAB, Molecule* molecule){ | ||
965 | 965 | |
966 | 966 | int totalAtomNumber = molecule->GetAtomVect()->size(); |
967 | 967 | int A=0; |
968 | - #pragma omp parallel for private(A) schedule(auto) | |
968 | + #pragma omp parallel for schedule(auto) | |
969 | 969 | for(A=0; A<totalAtomNumber; A++){ |
970 | 970 | Atom* atomA = (*(molecule->GetAtomVect()))[A]; |
971 | 971 | int na = atomA->GetValenceShellType() + 1; |
@@ -1028,7 +1028,7 @@ void Cndo2::CalcGammaAB(double** gammaAB, Molecule* molecule){ | ||
1028 | 1028 | } |
1029 | 1029 | } |
1030 | 1030 | |
1031 | - #pragma omp parallel for private(A) schedule(auto) | |
1031 | + #pragma omp parallel for schedule(auto) | |
1032 | 1032 | for(A=0; A<totalAtomNumber; A++){ |
1033 | 1033 | for(int B=0; B<A; B++){ |
1034 | 1034 | gammaAB[A][B] = gammaAB[B][A]; |
@@ -62,10 +62,10 @@ TRANSLATE_END | ||
62 | 62 | //GEOMETRY_END |
63 | 63 | |
64 | 64 | // S2 |
65 | -GEOMETRY | |
66 | - S 0.424528 0.741240 0.000000 | |
67 | - S -1.353072 0.741240 0.000000 | |
68 | -GEOMETRY_END | |
65 | +//GEOMETRY | |
66 | +// S 0.424528 0.741240 0.000000 | |
67 | +// S -1.353072 0.741240 0.000000 | |
68 | +//GEOMETRY_END | |
69 | 69 | |
70 | 70 | // s |
71 | 71 | //GEOMETRY |
@@ -107,11 +107,11 @@ GEOMETRY_END | ||
107 | 107 | //GEOMETRY_END |
108 | 108 | |
109 | 109 | // h2s |
110 | -//GEOMETRY | |
111 | -// S -0.559299 0.471698 0.000000 | |
112 | -// H 0.750701 0.471698 0.000000 | |
113 | -// H -0.996586 1.706558 0.000000 | |
114 | -//GEOMETRY_END | |
110 | +GEOMETRY | |
111 | + S -0.559299 0.471698 0.000000 | |
112 | + H 0.750701 0.471698 0.000000 | |
113 | + H -0.996586 1.706558 0.000000 | |
114 | +GEOMETRY_END | |
115 | 115 | |
116 | 116 | // benzene |
117 | 117 | //GEOMETRY |