Commit f809d190 authored by Michael Sherman's avatar Michael Sherman
Browse files

Minor tweaks.

parent b3e08761
...@@ -21,8 +21,7 @@ ...@@ -21,8 +21,7 @@
#include "OpenMM.h" #include "OpenMM.h"
#include <iostream> #include <cstdio>
#include <iomanip>
#include <string> #include <string>
using OpenMM::Vec3; // so we can just say "Vec3" below using OpenMM::Vec3; // so we can just say "Vec3" below
...@@ -120,9 +119,11 @@ static void simulateNaCl() { ...@@ -120,9 +119,11 @@ static void simulateNaCl() {
const AtomInfo& atom = atoms[n]; const AtomInfo& atom = atoms[n];
system.addParticle(atom.mass); system.addParticle(atom.mass);
nonbond->addParticle(atom.charge, nonbond->addParticle(atom.charge,
atom.vdwRadiusInAng * OpenMM::NmPerAngstrom * SigmaPerVdwRadius, atom.vdwRadiusInAng * OpenMM::NmPerAngstrom
* SigmaPerVdwRadius,
atom.vdwEnergyInKcal * OpenMM::KJPerKcal); atom.vdwEnergyInKcal * OpenMM::KJPerKcal);
initialPositions.push_back(atoms[n].initPosInAngstroms * OpenMM::NmPerAngstrom); initialPositions.push_back(atoms[n].initPosInAngstroms
* OpenMM::NmPerAngstrom);
} }
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment