Commit: bde032db0299f0a8e5fa50623051c58456472c19 - MolDS (git)

Commit MetaInfo

• Revisión: bde032db0299f0a8e5fa50623051c58456472c19 (tree)
• Tiempo: 2012-07-03 01:13:07
• Autor: Mikiya Fujii <mikiya.fujii@gmai...>
• Commiter: Mikiya Fujii

Log Message

Cndo2::GetDiatomVdWCorrectionEnergyFirstDerivative is refactored. #28554

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

Cambiar Resumen

• modified: src/cndo/Cndo2.cpp
• modified: src/cndo/Cndo2.h

Diferencia incremental

--- a/src/cndo/Cndo2.cpp
+++ b/src/cndo/Cndo2.cpp
@@ -335,6 +335,15 @@ double Cndo2::GetVdwDampingValue(double vdWDistance, double distance) const{
    double dampingFactor = Parameters::GetInstance()->GetVdWDampingFactorSCF();
    return 1.0/(1.0+exp(-1.0*dampingFactor*(distance/vdWDistance - 1.0)));
 }
+
+// See damping function in (2) in [G_2004] ((11) in [G_2006])
+double Cndo2::GetVdwDampingValueFirstDerivative(double vdWDistance, double distance) const{
+   double dampingFactor = Parameters::GetInstance()->GetVdWDampingFactorSCF();
+   return (dampingFactor/vdWDistance)
+         *exp(-1.0*dampingFactor*(distance/vdWDistance - 1.0))
+         *pow(1.0+exp(-1.0*dampingFactor*(distance/vdWDistance - 1.0)),-2.0);
+}
+
 // See (2) in [G_2004] ((11) in [G_2006])
 double Cndo2::GetDiatomVdWCorrectionEnergy(int indexAtomA, int indexAtomB) const{
    const Atom& atomA = *this->molecule->GetAtom(indexAtomA);
@@ -359,10 +368,8 @@ double Cndo2::GetDiatomVdWCorrectionFirstDerivative(int indexAtomA, int indexAto
    double vdWCoefficients = 2.0*atomA.GetVdWCoefficient()*atomB.GetVdWCoefficient()
                            /(atomA.GetVdWCoefficient()+atomB.GetVdWCoefficient());
    double dampingFactor = Parameters::GetInstance()->GetVdWDampingFactorSCF();
-   double damping = 1.0/(1.0+exp(-1.0*dampingFactor*(distance/vdWDistance - 1.0)));
-   double dampingFirstDerivative = (dampingFactor/vdWDistance)
-                                  *exp(-1.0*dampingFactor*(distance/vdWDistance - 1.0))
-                                  *pow(1.0+exp(-1.0*dampingFactor*(distance/vdWDistance - 1.0)),-2.0);
+   double damping = this->GetVdwDampingValue(vdWDistance, distance);
+   double dampingFirstDerivative = this->GetVdwDampingValueFirstDerivative(vdWDistance, distance);
    double value=0.0;
    value += 6.0*pow(distance,-7.0)*damping - pow(distance,-6.0)*dampingFirstDerivative;
    value *= vdWCoefficients;

--- a/src/cndo/Cndo2.h
+++ b/src/cndo/Cndo2.h
@@ -260,6 +260,7 @@ private:
    void CalcCoreRepulsionEnergy();
    void CalcVdWCorrectionEnergy();
    double GetVdwDampingValue(double vdWDistance, double distance) const;
+   double GetVdwDampingValueFirstDerivative(double vdWDistance, double distance) const;
    void CalcElectronicDipoleMomentGroundState(double*** electronicTransitionDipoleMoments,
                                               double const* const* const* cartesianMatrix,
                                               const MolDS_base::Molecule& molecule,