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

Comparing branches/development/src/brains/ForceManager.hpp (file contents):
Revision 1665 by gezelter, Tue Nov 22 20:38:56 2011 UTC vs.
Revision 1723 by gezelter, Thu May 24 20:59:54 2012 UTC

# Line 82 | Line 82 | namespace OpenMD {
82  
83    protected:
84      bool initialized_;
85 +    bool doParticlePot_;
86 +    bool doHeatFlux_;
87  
88      virtual void setupCutoffs();
89      virtual void preCalculation();        
# Line 96 | Line 98 | namespace OpenMD {
98      SwitchingFunction* switcher_;
99  
100      SwitchingFunctionType sft_;/**< Type of switching function in use */
99 –
100 –
101      RealType rCut_;            /**< cutoff radius for non-bonded interactions */
102      RealType rSwitch_;         /**< inner radius of switching function */
103      CutoffMethod cutoffMethod_;/**< Cutoff Method for most non-bonded interactions */
# Line 111 | Line 111 | namespace OpenMD {
111      vector<RealType> vdwScale_;
112      vector<RealType> electrostaticScale_;
113  
114 <    Mat3x3d tau;
115 <
114 >    Mat3x3d stressTensor;
115    };
116   }
117   #endif //BRAINS_FORCEMANAGER_HPP

Diff Legend

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