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 1579 by gezelter, Thu Jun 9 20:26:29 2011 UTC vs.
Revision 1656 by jmichalk, Tue Oct 11 19:46:51 2011 UTC

# Line 52 | Line 52
52   #include "nonbonded/Morse.hpp"
53   #include "nonbonded/Electrostatic.hpp"
54   #include "nonbonded/MAW.hpp"
55 + #include "nonbonded/RepulsivePower.hpp"
56   #include "nonbonded/SwitchingFunction.hpp"
57  
58   using namespace std;
# Line 77 | Line 78 | namespace OpenMD {
78      void doPair(InteractionData idat);    
79      void doSkipCorrection(InteractionData idat);
80      void doSelfCorrection(SelfData sdat);
81 +    void setCutoffRadius(RealType rCut);
82 +    void setSwitchingRadius(RealType rSwitch);
83      RealType getSuggestedCutoffRadius(int *atid1);  
84      RealType getSuggestedCutoffRadius(AtomType *atype);
85      
# Line 93 | Line 96 | namespace OpenMD {
96      SC* sc_;
97      Morse* morse_;
98      Electrostatic* electrostatic_;
99 +    RepulsivePower* repulsivePower_;
100      MAW* maw_;
101      
102      map<int, AtomType*> typeMap_;

Diff Legend

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