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 1528 by gezelter, Fri Dec 17 20:11:05 2010 UTC vs.
Revision 1529 by gezelter, Mon Dec 27 18:35:59 2010 UTC

# Line 65 | Line 65 | namespace OpenMD {
65  
66    public:
67      static InteractionManager* Instance();
68 <    static void setForceField(ForceField *ff) {forceField_ = ff;};    
68 >    static void setForceField(ForceField *ff) {forceField_ = ff;}
69  
70 <    static void setCutoffRadius(RealType rcut);
71 <    static void setSwitchingRadius(RealType rsw);
72 <    static void useShiftedForce();
70 >    static void setCutoffRadius(RealType rcut) {rCut_ = rcut;}
71 >    static void setSwitchingRadius(RealType rsw) {rSwitch_ = rsw;}
72 >    static void useShiftedForce() ;
73      static void useShiftedPot();
74  
75      // Fortran support routines
# Line 102 | Line 102 | namespace OpenMD {
102      static Morse* morse_;
103      static Electrostatic* electrostatic_;
104  
105 +    static RealType rCut_;
106 +    static RealType rSwitch_;
107 +
108      static map<int, AtomType*> typeMap_;
109      /**
110       * Each pair of atom types can have multiple interactions, so the

Diff Legend

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