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 1505 by gezelter, Sun Oct 3 22:18:59 2010 UTC vs.
Revision 1725 by gezelter, Sat May 26 18:13:43 2012 UTC

# Line 36 | Line 36
36   * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).            
37   * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
38   * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
39 < * [4]  Vardeman & Gezelter, in progress (2009).                        
39 > * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40 > * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
42  
43   #ifndef NONBONDED_LJ_HPP
44   #define NONBONDED_LJ_HPP
45  
46   #include "nonbonded/NonBondedInteraction.hpp"
47 < #include "types/AtomType.hpp"
47 < #include "UseTheForce/ForceField.hpp"
47 > #include "brains/ForceField.hpp"
48   #include "math/Vector3.hpp"
49  
50   using namespace std;
# Line 64 | Line 64 | namespace OpenMD {
64      void setForceField(ForceField *ff) {forceField_ = ff;};
65      void addType(AtomType* atomType);
66      void addExplicitInteraction(AtomType* atype1, AtomType* atype2, RealType sigma, RealType epsilon);
67 <    RealType getSigma(AtomType* atomType);
68 <    RealType getEpsilon(AtomType* atomType);
69 <    virtual void calcForce(InteractionData idat);
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();
75    LJParam  getLJParam(AtomType* atomType);
73      RealType getSigma(AtomType* atomType1, AtomType* atomType2);
74      RealType getEpsilon(AtomType* atomType1, AtomType* atomType2);
75      
# Line 82 | Line 79 | namespace OpenMD {
79  
80      map<int, AtomType*> LJMap;
81      map<pair<AtomType*, AtomType*>, LJInteractionData> MixingMap;
85    bool shiftedPot_;
86    bool shiftedFrc_;
82      ForceField* forceField_;
83      string name_;
84    };

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines