• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
Aucun tag

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

Commit MetaInfo

Révision5f568d7ec6abe2134da22ea8f133666c21f68d18 (tree)
l'heure2011-02-07 14:03:08
AuteurMikiya Fujii <mikiya.fujii@gmai...>
CommiterMikiya Fujii

Message de Log

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

Change Summary

Modification

--- a/src/MolDS.cpp
+++ b/src/MolDS.cpp
@@ -7,6 +7,7 @@
77 #include<time.h>
88 #include<list>
99 #include<vector>
10+#include<omp.h>
1011 #include"base/Utilities.h"
1112 #include"base/MolDSException.h"
1213 #include"base/Enums.h"
--- a/src/cndo/Cndo2.h
+++ b/src/cndo/Cndo2.h
@@ -965,7 +965,7 @@ void Cndo2::CalcGammaAB(double** gammaAB, Molecule* molecule){
965965
966966 int totalAtomNumber = molecule->GetAtomVect()->size();
967967 int A=0;
968- #pragma omp parallel for private(A) schedule(auto)
968+ #pragma omp parallel for schedule(auto)
969969 for(A=0; A<totalAtomNumber; A++){
970970 Atom* atomA = (*(molecule->GetAtomVect()))[A];
971971 int na = atomA->GetValenceShellType() + 1;
@@ -1028,7 +1028,7 @@ void Cndo2::CalcGammaAB(double** gammaAB, Molecule* molecule){
10281028 }
10291029 }
10301030
1031- #pragma omp parallel for private(A) schedule(auto)
1031+ #pragma omp parallel for schedule(auto)
10321032 for(A=0; A<totalAtomNumber; A++){
10331033 for(int B=0; B<A; B++){
10341034 gammaAB[A][B] = gammaAB[B][A];
--- a/src/input.in
+++ b/src/input.in
@@ -62,10 +62,10 @@ TRANSLATE_END
6262 //GEOMETRY_END
6363
6464 // 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
6969
7070 // s
7171 //GEOMETRY
@@ -107,11 +107,11 @@ GEOMETRY_END
107107 //GEOMETRY_END
108108
109109 // 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
115115
116116 // benzene
117117 //GEOMETRY