Commit: 9fa2cd5a54d52dc80dc21e383f2a2ea3a397532d - MolDS (git)

Commit MetaInfo

• Revisión: 9fa2cd5a54d52dc80dc21e383f2a2ea3a397532d (tree)
• Tiempo: 2011-02-05 20:31:50
• Autor: Mikiya Fujii <mikiya.fujii@gmai...>
• Commiter: Mikiya Fujii

Log Message

diss and damping are not applied to guess.

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

Cambiar Resumen

• modified: src/cndo/Cndo2.h

Diferencia incremental

--- a/src/cndo/Cndo2.h
+++ b/src/cndo/Cndo2.h
@@ -371,21 +371,21 @@ void Cndo2::DoesSCF(){
             break;
          }
          else{
+            if(!isGuess){ 
+               // damping
+               this->DoesDamp(rmsDensity, this->orbitalElectronPopulation, oldOrbitalElectronPopulation, this->molecule);
            
-            // damping
-            this->DoesDamp(rmsDensity, this->orbitalElectronPopulation, oldOrbitalElectronPopulation, this->molecule);
-           
-            // diis 
-            this->DoesDIIS(this->orbitalElectronPopulation,
-                           oldOrbitalElectronPopulation,
-                           diisStoredDensityMatrix,
-                           diisStoredErrorVect,
-                           diisErrorProducts,
-                           diisErrorCoefficients,
-                           diisNumErrorVect,
-                           this->molecule,
-                           i);
-            
+               // diis 
+               this->DoesDIIS(this->orbitalElectronPopulation,
+                              oldOrbitalElectronPopulation,
+                              diisStoredDensityMatrix,
+                              diisStoredErrorVect,
+                              diisErrorProducts,
+                              diisErrorCoefficients,
+                              diisNumErrorVect,
+                              this->molecule,
+                              i);
+            }
             // calc. electron population in each atom.
             this->CalcAtomicElectronPopulation(this->atomicElectronPopulation, 
                                                this->orbitalElectronPopulation,