Commit: b939902d293d262e2de4a8ee0bd726eabe5d21ce - MolDS (git)

Commit MetaInfo

• Revisão: b939902d293d262e2de4a8ee0bd726eabe5d21ce (tree)
• Hora: 2012-11-16 18:03:52
• Autor: Mikiya Fujii <mikiya.fujii@gmai...>
• Commiter: Mikiya Fujii

Mensagem de Log

Parallelization of calculation of the dipole moment of the ground state is modified to be more efficient for many core machines. #30111

git-svn-id: https://svn.sourceforge.jp/svnroot/molds/trunk@1119 1136aad2-a195-0410-b898-f5ea1d11b9d8

Mudança Sumário

• modified: src/cndo/Cndo2.cpp

Diff

--- a/src/cndo/Cndo2.cpp
+++ b/src/cndo/Cndo2.cpp
@@ -1660,30 +1660,18 @@ void Cndo2::CalcElectronicDipoleMomentGroundState(double*** electronicTransition
                                                   double const* const* orbitalElectronPopulation,
                                                   double const* const* overlapAOs) const{
    int groundState = 0;
-   stringstream ompErrors;
-#pragma omp parallel for schedule(auto) 
    for(int axis=0; axis<CartesianType_end; axis++){
-      try{
-         electronicTransitionDipoleMoments[groundState][groundState][axis] = this->GetElectronicTransitionDipoleMoment(
-                                                                                   groundState,
-                                                                                   groundState,
-                                                                                   static_cast<CartesianType>(axis),
-                                                                                   NULL,
-                                                                                   NULL,
-                                                                                   cartesianMatrix,
-                                                                                   molecule,
-                                                                                   orbitalElectronPopulation,
-                                                                                   overlapAOs,
-                                                                                   NULL);
-      }
-      catch(MolDSException ex){
-#pragma omp critical
-         ompErrors << ex.what() << endl ;
-      }
-   }
-   // Exception throwing for omp-region
-   if(!ompErrors.str().empty()){
-      throw MolDSException(ompErrors.str());
+      electronicTransitionDipoleMoments[groundState][groundState][axis] = this->GetElectronicTransitionDipoleMoment(
+                                                                                groundState,
+                                                                                groundState,
+                                                                                static_cast<CartesianType>(axis),
+                                                                                NULL,
+                                                                                NULL,
+                                                                                cartesianMatrix,
+                                                                                molecule,
+                                                                                orbitalElectronPopulation,
+                                                                                overlapAOs,
+                                                                                NULL);
    }
 }
 
@@ -1695,16 +1683,31 @@ double Cndo2::GetElectronicTransitionDipoleMoment(int to, int from, CartesianTyp
                                                   double const* const* orbitalElectronPopulation,
                                                   double const* const* overlapAOs,
                                                   double const* groundStateDipole) const{
-   double value = 0.0;
    int groundState = 0;
    if(from == groundState && to == groundState){
+      double value = 0.0;
       int totalAONumber = molecule.GetTotalNumberAOs();
+      stringstream ompErrors;
+#pragma omp parallel for reduction(+:value) schedule(auto) 
       for(int mu=0; mu<totalAONumber; mu++){
-         for(int nu=0; nu<totalAONumber; nu++){
-            value -= orbitalElectronPopulation[mu][nu]
-                    *(cartesianMatrix[mu][nu][axis]-molecule.GetXyzCOC()[axis]*overlapAOs[mu][nu]);
+         try{
+            double threadValue = 0.0;
+            for(int nu=0; nu<totalAONumber; nu++){
+               threadValue -= orbitalElectronPopulation[mu][nu]
+                             *(cartesianMatrix[mu][nu][axis]-molecule.GetXyzCOC()[axis]*overlapAOs[mu][nu]);
+            }
+            value += threadValue;
+         }
+         catch(MolDSException ex){
+#pragma omp critical
+            ompErrors << ex.what() << endl ;
          }
       }
+      // Exception throwing for omp-region
+      if(!ompErrors.str().empty()){
+         throw MolDSException(ompErrors.str());
+      }
+      return value;
    }
    else{
       stringstream ss;
@@ -1714,7 +1717,6 @@ double Cndo2::GetElectronicTransitionDipoleMoment(int to, int from, CartesianTyp
       ss << this->errorMessageCartesianType << CartesianTypeStr(axis) << endl;
       throw MolDSException(ss.str());
    }
-   return value;
 }
 
 // calculate Cartesian matrix between atomic orbitals.