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

Comparing branches/development/src/nonbonded/Sticky.hpp (file contents):
Revision 1502 by gezelter, Sat Oct 2 19:53:32 2010 UTC vs.
Revision 1710 by gezelter, Fri May 18 21:44:02 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_STICKY_HPP
44   #define NONBONDED_STICKY_HPP
45  
46   #include "nonbonded/NonBondedInteraction.hpp"
47 < #include "types/DirectionalAtomType.hpp"
47 > #include "types/StickyAdapter.hpp"
48   #include "UseTheForce/ForceField.hpp"
49   #include "math/SquareMatrix3.hpp"
50   #include "math/CubicSpline.hpp"
# Line 71 | Line 72 | namespace OpenMD {
72      Sticky();
73      void setForceField(ForceField *ff) {forceField_ = ff;};
74      void addType(AtomType* atomType);
75 <    virtual void calcForce(InteractionData idat);
75 >    virtual void calcForce(InteractionData &idat);
76      virtual string getName() { return name_; }
77 <        
77 >    virtual RealType getSuggestedCutoffRadius(pair<AtomType*, AtomType*> atypes);
78 >    
79    private:
80      void initialize();
79    StickyParam  getStickyParam(AtomType* atomType);
80
81      bool initialized_;
82      map<int, AtomType*> StickyMap;
83      map<pair<AtomType*, AtomType*>, StickyInteractionData> MixingMap;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines