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 1575 by gezelter, Fri Jun 3 21:39:49 2011 UTC vs.
Revision 1582 by gezelter, Tue Jun 14 20:41:44 2011 UTC

# Line 56 | Line 56 | namespace OpenMD {
56     * being applied to any given pair of atom types.
57     */
58    enum InteractionFamily {
59 <    NO_FAMILY,             /**< No family defined */
60 <    VANDERWAALS_FAMILY,    /**< Long-range dispersion and short-range pauli repulsion */
61 <    ELECTROSTATIC_FAMILY,  /**< Coulombic and point-multipole interactions */
62 <    METALLIC_FAMILY,       /**< Transition metal interactions involving electron density */
63 <    HYDROGENBONDING_FAMILY,/**< Short-range directional interactions */
64 <    N_INTERACTION_FAMILIES
59 >    NO_FAMILY = 0,             /**< No family defined */
60 >    VANDERWAALS_FAMILY = 1,    /**< Long-range dispersion and short-range pauli repulsion */
61 >    ELECTROSTATIC_FAMILY = 2,  /**< Coulombic and point-multipole interactions */
62 >    METALLIC_FAMILY = 3,       /**< Transition metal interactions involving electron density */
63 >    HYDROGENBONDING_FAMILY = 4,/**< Short-range directional interactions */
64 >    N_INTERACTION_FAMILIES = 5
65    };
66  
67    typedef Vector<RealType, N_INTERACTION_FAMILIES> potVec;

Diff Legend

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