--- branches/development/src/nonbonded/Electrostatic.cpp 2012/06/22 20:01:37 1761 +++ trunk/src/nonbonded/Electrostatic.cpp 2012/08/22 02:28:28 1782 @@ -53,8 +53,8 @@ #include "io/Globals.hpp" #include "nonbonded/SlaterIntegrals.hpp" #include "utils/PhysicalConstants.hpp" +#include "math/erfc.hpp" - namespace OpenMD { Electrostatic::Electrostatic(): name_("Electrostatic"), initialized_(false), @@ -365,9 +365,9 @@ namespace OpenMD { for (int i = 1; i < np_+1; i++) { rval = RealType(i) * dr; rvals.push_back(rval); - J1vals.push_back(electrostaticAtomData.hardness * sSTOCoulInt( a, b, m, n, rval * PhysicalConstants::angstromsToBohr ) ); + J1vals.push_back(sSTOCoulInt( a, b, m, n, rval * PhysicalConstants::angstromToBohr ) * PhysicalConstants::hartreeToKcal ); // may not be necessary if Slater coulomb integral is symmetric - J2vals.push_back(eaData2.hardness * sSTOCoulInt( b, a, n, m, rval * PhysicalConstants::angstromsToBohr ) ); + J2vals.push_back(sSTOCoulInt( b, a, n, m, rval * PhysicalConstants::angstromToBohr ) * PhysicalConstants::hartreeToKcal ); } CubicSpline* J1 = new CubicSpline();