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 1485 by gezelter, Wed Jul 28 19:52:00 2010 UTC vs.
Revision 1502 by gezelter, Sat Oct 2 19:53:32 2010 UTC

# Line 42 | Line 42
42   #ifndef NONBONDED_STICKY_HPP
43   #define NONBONDED_STICKY_HPP
44  
45 + #include "nonbonded/NonBondedInteraction.hpp"
46   #include "types/DirectionalAtomType.hpp"
47   #include "UseTheForce/ForceField.hpp"
48   #include "math/SquareMatrix3.hpp"
# Line 64 | Line 65 | namespace OpenMD {
65      bool isPower;
66    };
67  
68 <  class Sticky {
68 >  class Sticky : public HydrogenBondingInteraction {
69      
70    public:    
71 <    static Sticky* Instance();
72 <    static void setForceField(ForceField *ff) {forceField_ = ff;};
73 <    static void initialize();
74 <    static void addType(AtomType* atomType);
75 <    
76 <    static void calcForce(AtomType* at1, AtomType* at2, const Vector3d d, const RealType rij, const RealType r2, const RealType sw, RealType &vpair, RealType &pot, const RotMat3x3d A1, const RotMat3x3d A2, Vector3d &f1, Vector3d &t1, Vector3d &t2);
76 <    
77 <    // Fortran support routines;
78 <    static RealType getStickyCut(int atid);
79 <    static void do_sticky_pair(int *atid1, int *atid2, RealType *d, RealType *rij, RealType *r2, RealType *sw, RealType *vpair, RealType *pot, RealType *A1, RealType *A2, RealType *f1, RealType *t1, RealType *t2);
80 <    
71 >    Sticky();
72 >    void setForceField(ForceField *ff) {forceField_ = ff;};
73 >    void addType(AtomType* atomType);
74 >    virtual void calcForce(InteractionData idat);
75 >    virtual string getName() { return name_; }
76 >        
77    private:
78 <    virtual ~Sticky() { }
79 <    // singleton pattern, prevent reconstruction
84 <    Sticky() { }
85 <    Sticky(Sticky const &) {};
86 <    Sticky& operator=(Sticky const&) {};
87 <    static Sticky* _instance;
88 <  
89 <    static StickyParam  getStickyParam(AtomType* atomType);
78 >    void initialize();
79 >    StickyParam  getStickyParam(AtomType* atomType);
80  
81 <    static bool initialized_;
82 <    static map<int, AtomType*> StickyMap;
83 <    static map<pair<AtomType*, AtomType*>, StickyInteractionData> MixingMap;
84 <    static ForceField* forceField_;    
81 >    bool initialized_;
82 >    map<int, AtomType*> StickyMap;
83 >    map<pair<AtomType*, AtomType*>, StickyInteractionData> MixingMap;
84 >    ForceField* forceField_;    
85 >    string name_;
86    };
87   }
88  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines