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

Comparing branches/development/src/brains/DataStorage.hpp (file contents):
Revision 1710 by gezelter, Fri May 18 21:44:02 2012 UTC vs.
Revision 1711 by gezelter, Sat May 19 02:58:35 2012 UTC

# Line 72 | Line 72 | namespace OpenMD {
72        dslAmat = 4,
73        dslAngularMomentum = 8,
74        dslElectroFrame = 16,
75 <      dslZAngle = 32,
76 <      dslForce = 64,
77 <      dslTorque = 128,
78 <      dslParticlePot = 256,
79 <      dslDensity = 512,
80 <      dslFunctional = 1024,
81 <      dslFunctionalDerivative = 2048,
82 <      dslElectricField = 4096,
83 <      dslSkippedCharge = 8192,
84 <      dslFlucQPosition = 16384,
85 <      dslFlucQVelocity = 32768,
86 <      dslFlucQForce = 65536
75 >      dslForce = 32,
76 >      dslTorque = 64,
77 >      dslParticlePot = 128,
78 >      dslDensity = 256,
79 >      dslFunctional = 512,
80 >      dslFunctionalDerivative = 1024,
81 >      dslElectricField = 2048,
82 >      dslSkippedCharge = 4096,
83 >      dslFlucQPosition = 8192,
84 >      dslFlucQVelocity = 16384,
85 >      dslFlucQForce = 32768
86      };
87  
88      DataStorage();
# Line 128 | Line 127 | namespace OpenMD {
127      vector<RotMat3x3d> aMat;          /** rotation matrix array */
128      vector<Vector3d> angularMomentum; /** angular momentum array (body-fixed) */
129      vector<Mat3x3d> electroFrame;     /** the lab frame unit vector array*/
131 –    vector<RealType> zAngle;          /** z-angle array */        
130      vector<Vector3d> force;           /** force array */
131      vector<Vector3d> torque;          /** torque array */
132      vector<RealType> particlePot;     /** particle potential arrray */

Diff Legend

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