ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/nonbonded/NonBondedInteraction.hpp
(Generate patch)

Comparing branches/development/src/nonbonded/NonBondedInteraction.hpp (file contents):
Revision 1545 by gezelter, Fri Apr 8 21:25:19 2011 UTC vs.
Revision 1549 by gezelter, Wed Apr 27 18:38:15 2011 UTC

# Line 82 | Line 82 | namespace OpenMD {
82      RealType vdwMult;        /**< multiplier for van der Waals interactions */
83      RealType electroMult;    /**< multiplier for electrostatic interactions */
84      RealType pot[4];         /**< total potential */
85 <    RealType vpair[4];       /**< pair potential */
85 >    RealType vpair;          /**< pair potential */
86      Vector3d f1;             /**< force between the two atoms */
87      Mat3x3d eFrame1;         /**< pointer to electrostatic frame for first atom */
88      Mat3x3d eFrame2;         /**< pointer to electrostatic frame for second atom*/

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines