コミット: 486d6bbdd08885c502fe67bdbfa2f6a071a5f3e5 - MolDS (git)

コミットメタ情報

• リビジョン: 486d6bbdd08885c502fe67bdbfa2f6a071a5f3e5 (tree)
• 日時: 2012-12-05 10:57:29
• 作者: Katsuhiko Nishimra <ktns.87@gmai...>
• コミッター: Katsuhiko Nishimra

ログメッセージ

Push back the oldest error vector after recalculating GDIIS step without it. #28915

git-svn-id: https://svn.sourceforge.jp/svnroot/molds/branches/gdiis@1174 1136aad2-a195-0410-b898-f5ea1d11b9d8

変更サマリ

• modified: src/optimization/GDIIS.cpp
• modified: src/optimization/GDIIS.h

差分

--- a/src/optimization/GDIIS.cpp
+++ b/src/optimization/GDIIS.cpp
@@ -50,6 +50,7 @@ GDIIS::GDIIS(int sizeErrorVector):
    messageTakingGDIISStep("Taking GDIIS step.\n"),
    messageSingularGDIISMatrix("Error while solving GDIIS equation. Discarding current data.\n"),
    messageOnlyOneErrorVector("There is only one error vector.\n"),
+   messageRecalcGDIISStep("Recalculate GDIIS step without the oldest error vector.\n"),
    formatTooSmallLagrangeMultiplier("GDIIS: Lagrange Multiplier is too small. (%e)\n"),
    formatTooLargeGDIISStep("GDIIS: GDIIS step is too large. (gdiis:%e, reference:%e)\n"),
    formatWrongDirection("GDIIS: GDIIS step direction is too far from reference step. (cosine: %+f)\n")
@@ -131,6 +132,7 @@ void GDIIS::CalcGDIIS(double* vectorError,
 
    // If only one error vector is given, following routine is meaningless.
    if(numErrors <= 1){
+      this->OutputLog(messageOnlyOneErrorVector);
       throw GDIISException(this->messageOnlyOneErrorVector);
    }
 
@@ -158,8 +160,7 @@ void GDIIS::CalcGDIIS(double* vectorError,
          this->OutputLog((this->formatTooSmallLagrangeMultiplier % -vectorCoefs[numErrors]).str());
          MallocerFreer::GetInstance()->Free(&vectorCoefs, numErrors+1);
          // Recalculate GDIIS step without the oldest data.
-         this->DiscardOldest();
-         return CalcGDIIS(vectorError,vectorPosition,vectorRefStep);
+         return this->RecalcGDIIS(vectorError,vectorPosition,vectorRefStep);
       }
 
       // Interpolate error vectors and positions
@@ -193,8 +194,7 @@ void GDIIS::CalcGDIIS(double* vectorError,
          this->OutputLog((this->formatTooLargeGDIISStep % sqrt(normSquaregdiis) % sqrt(normSquareref)).str());
          MallocerFreer::GetInstance()->Free(&vectorCoefs, numErrors+1);
          // and recalculate GDIIS step without the oldest data
-         this->DiscardOldest();
-         return CalcGDIIS(vectorError,vectorPosition,vectorRefStep);
+         return this->RecalcGDIIS(vectorError,vectorPosition,vectorRefStep);
       }
 
       // If the calculated cos(theta) on Eq. 8 of [FS_2002] is below the minimum tolerant value
@@ -207,8 +207,7 @@ void GDIIS::CalcGDIIS(double* vectorError,
          this->OutputLog((formatWrongDirection % cosine).str());
          MallocerFreer::GetInstance()->Free(&vectorCoefs, numErrors+1);
          // and recalculate GDIIS step without the oldest data
-         this->DiscardOldest();
-         return CalcGDIIS(vectorError,vectorPosition,vectorRefStep);
+         return this->RecalcGDIIS(vectorError,vectorPosition,vectorRefStep);
       }
    }
    catch(GDIISException ex){
@@ -223,6 +222,30 @@ void GDIIS::CalcGDIIS(double* vectorError,
    this->OutputLog(messageTakingGDIISStep);
 }
 
+void GDIIS::RecalcGDIIS(double* vectorError,
+                        double* vectorPosition,
+                        double const* vectorRefStep) throw(GDIISException, MolDS_base::MolDSException){
+   double *vectorErrorOldest    = NULL;
+   double *vectorPositionOldest = NULL;
+
+   this->PopOldest(&vectorErrorOldest, &vectorPositionOldest);
+
+   this->OutputLog(messageRecalcGDIISStep);
+
+   try{
+      this->CalcGDIIS(vectorError, vectorPosition, vectorRefStep);
+   }
+   catch(GDIISException ex){
+      this->PushOldest(vectorErrorOldest, vectorPositionOldest);
+      throw ex;
+   }
+   catch(MolDSException ex){
+      MallocerFreer::GetInstance()->Free(&vectorErrorOldest,   this->sizeErrorVector);
+      MallocerFreer::GetInstance()->Free(&vectorPositionOldest, this->sizeErrorVector);
+      throw ex;
+   }
+}
+
 void GDIIS::DoGDIIS(double *vectorError, Molecule& molecule, double const* vectorRefStep) throw(GDIISException, MolDS_base::MolDSException){
    double** matrixPosition = NULL;
    try{

--- a/src/optimization/GDIIS.h
+++ b/src/optimization/GDIIS.h
@@ -53,6 +53,9 @@ private:
    void CalcGDIIS(double*       vectorError,
                   double*       vectorPosition,
                   double const* vectorRefStep) throw(GDIISException, MolDS_base::MolDSException);
+   void RecalcGDIIS(double*       vectorError,
+                    double*       vectorPosition,
+                    double const* vectorRefStep) throw(GDIISException, MolDS_base::MolDSException);
    void PopOldest(double** vectorError, double** vectorPosition);
    void PushOldest(double* vectorError, double* vectorPosition);
    const int sizeErrorVector;
@@ -64,6 +67,7 @@ private:
    std::string messageTakingGDIISStep;
    std::string messageSingularGDIISMatrix;
    std::string messageOnlyOneErrorVector;
+   std::string messageRecalcGDIISStep;
    boost::format formatTooSmallLagrangeMultiplier;
    boost::format formatTooLargeGDIISStep;
    boost::format formatWrongDirection;