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

Comparing branches/development/src/nonbonded/InteractionManager.hpp (file contents):
Revision 1850 by gezelter, Wed Feb 20 15:39:39 2013 UTC vs.
Revision 1877 by gezelter, Thu Jun 6 15:43:35 2013 UTC

# Line 60 | Line 60 | namespace OpenMD {
60  
61   namespace OpenMD {
62  
63 +  const static int ELECTROSTATIC_PAIR  = (1 << 0);  
64 +  const static int LJ_PAIR             = (1 << 1);
65 +  const static int EAM_PAIR            = (1 << 2);
66 +  const static int SC_PAIR             = (1 << 3);
67 +  const static int STICKY_PAIR         = (1 << 4);
68 +  const static int GB_PAIR             = (1 << 5);
69 +  const static int MORSE_PAIR          = (1 << 6);
70 +  const static int REPULSIVEPOWER_PAIR = (1 << 7);
71 +  const static int MAW_PAIR            = (1 << 8);
72 +
73    /**
74     * @class InteractionManager
75     * InteractionManager is responsible for
# Line 69 | Line 79 | namespace OpenMD {
79  
80    public:
81      InteractionManager();
82 <    ~InteractionManager();
82 >    virtual ~InteractionManager();
83      void setSimInfo(SimInfo* info) {info_ = info;}
84      void initialize();
85  
# Line 106 | Line 116 | namespace OpenMD {
116       * natural data structures are a map between the pair, and a set
117       * of non-bonded interactions.
118       */
119 <    map<pair<AtomType*, AtomType*>, set<NonBondedInteraction*> > interactions_;    
119 >    map<pair<AtomType*, AtomType*>, set<NonBondedInteraction*> > interactions_;
120 >    map<pair<AtomType*, AtomType*>, int> iHash_;
121 >
122    };
123   }
124   #endif

Diff Legend

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