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

Comparing branches/development/src/nonbonded/EAM.hpp (file contents):
Revision 1709 by gezelter, Tue Nov 22 20:38:56 2011 UTC vs.
Revision 1710 by gezelter, Fri May 18 21:44:02 2012 UTC

# Line 44 | Line 44
44   #define NONBONDED_EAM_HPP
45  
46   #include "nonbonded/NonBondedInteraction.hpp"
47 < #include "types/AtomType.hpp"
47 > #include "types/EAMAdapter.hpp"
48   #include "UseTheForce/ForceField.hpp"
49   #include "math/Vector3.hpp"
50   #include "math/CubicSpline.hpp"
# Line 86 | Line 86 | namespace OpenMD {
86  
87    private:
88      void initialize();  
89 –    EAMParam getEAMParam(AtomType* atomType);
90 –    CubicSpline* getZ(AtomType* atomType);
91 –    CubicSpline* getRho(AtomType* atomType);
92 –    CubicSpline* getF(AtomType* atomType);
93 –    RealType getRcut(AtomType* atomType);
89      CubicSpline* getPhi(AtomType* atomType1, AtomType* atomType2);
90      
91      bool initialized_;

Diff Legend

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