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

Comparing branches/development/src/nonbonded/LJ.hpp (file contents):
Revision 1476 by gezelter, Wed Jul 21 18:31:05 2010 UTC vs.
Revision 1483 by gezelter, Tue Jul 27 21:17:31 2010 UTC

# Line 64 | Line 64 | namespace OpenMD {
64      static void addType(AtomType* atomType);
65      static void addExplicitInteraction(AtomType* atype1, AtomType* atype2, RealType sigma, RealType epsilon);
66      static void calcForce(AtomType* at1, AtomType* at2, const Vector3d d, const RealType rij, const RealType r2, const RealType rcut, const RealType sw, const RealType vdwMult, RealType &vpair, RealType &pot, Vector3d &f1);
67 <
67 >    static RealType getSigma(AtomType* atomType);
68 >    static RealType getEpsilon(AtomType* atomType);
69 >    
70      // Fortran support routines;
71      static RealType getSigma(int atid);
72      static RealType getEpsilon(int atid);
# Line 80 | Line 82 | namespace OpenMD {
82      static LJ* _instance;
83    
84      static LJParam  getLJParam(AtomType* atomType);
83 –    static RealType getSigma(AtomType* atomType);
84 –    static RealType getEpsilon(AtomType* atomType);
85 –    
85      static RealType getSigma(AtomType* atomType1, AtomType* atomType2);
86      static RealType getEpsilon(AtomType* atomType1, AtomType* atomType2);
87      

Diff Legend

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