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

Comparing branches/development/src/nonbonded/MAW.hpp (file contents):
Revision 1544 by gezelter, Wed Jan 5 14:49:05 2011 UTC vs.
Revision 1545 by gezelter, Fri Apr 8 21:25:19 2011 UTC

# Line 66 | Line 66 | namespace OpenMD {
66      void addExplicitInteraction(AtomType* atype1, AtomType* atype2, RealType De, RealType beta, RealType Re, RealType ca1, RealType cb1);
67      virtual void calcForce(InteractionData &idat);
68      virtual string getName() {return name_;}
69 <    virtual RealType getSuggestedCutoffRadius(AtomType* at1, AtomType* at2);
69 >    virtual RealType getSuggestedCutoffRadius(pair<AtomType*, AtomType*> atypes);
70      
71    private:
72      void initialize();

Diff Legend

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