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 1711 by gezelter, Sat May 19 02:58:35 2012 UTC vs.
Revision 1808 by gezelter, Mon Oct 22 20:42:10 2012 UTC

# Line 44 | Line 44
44   * @file ForceManager.hpp
45   * @author tlin
46   * @date 11/09/2004
47 – * @time 10:36am
47   * @version 1.0
48   */
49  
# Line 56 | Line 55
55   #include "nonbonded/Cutoffs.hpp"
56   #include "nonbonded/SwitchingFunction.hpp"
57   #include "nonbonded/InteractionManager.hpp"
58 + #include "perturbations/Perturbation.hpp"
59   #include "parallel/ForceDecomposition.hpp"
60  
61   #define PREPAIR_LOOP 0
# Line 83 | Line 83 | namespace OpenMD {
83    protected:
84      bool initialized_;
85      bool doParticlePot_;
86 +    bool doElectricField_;
87 +    bool doHeatFlux_;
88  
89      virtual void setupCutoffs();
90      virtual void preCalculation();        
# Line 97 | Line 99 | namespace OpenMD {
99      SwitchingFunction* switcher_;
100  
101      SwitchingFunctionType sft_;/**< Type of switching function in use */
100 –
101 –
102      RealType rCut_;            /**< cutoff radius for non-bonded interactions */
103      RealType rSwitch_;         /**< inner radius of switching function */
104      CutoffMethod cutoffMethod_;/**< Cutoff Method for most non-bonded interactions */
# Line 112 | Line 112 | namespace OpenMD {
112      vector<RealType> vdwScale_;
113      vector<RealType> electrostaticScale_;
114  
115 <    Mat3x3d tau;
115 >    Mat3x3d stressTensor;
116  
117 +    vector<Perturbation*> perturbations_;
118    };
119   }
120   #endif //BRAINS_FORCEMANAGER_HPP

Diff Legend

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