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

Comparing trunk/src/brains/DataStorage.hpp (file contents):
Revision 507 by gezelter, Fri Apr 15 22:04:00 2005 UTC vs.
Revision 1245 by chuckv, Tue May 27 16:39:06 2008 UTC

# Line 58 | Line 58 | namespace oopse {
58     * @class DataStorage
59     * @warning do not try to insert element into (or ease element from) private member data
60     * of DataStorage directly.
61 <   * @todo DataStorage may need refactorying. Every std::vector can inherit from the same base class
61 >   * @todo DataStorage may need refactoring. Every std::vector can inherit from the same base class
62     * which will make it easy to maintain
63     */
64    class DataStorage {
# Line 72 | Line 72 | namespace oopse {
72        dslElectroFrame = 16,
73        dslZAngle = 32,
74        dslForce = 64,
75 <      dslTorque = 128
75 >      dslTorque = 128,
76 >      dslParticlePot = 256
77      };
78  
79  
80      DataStorage();
81 <    DataStorage(int size, int storageLayout = 255);
81 >    DataStorage(int size, int storageLayout = 511);
82      /** return the size of this DataStorage. */
83      int getSize();
84      /**
# Line 105 | Line 106 | namespace oopse {
106      /** Sets the storage layout  */
107      void setStorageLayout(int layout);
108      /** Returns the pointer of internal array */
109 <    double *getArrayPointer(int whichArray);
109 >    RealType *getArrayPointer(int whichArray);
110  
111      std::vector<Vector3d> position;               /** position array */
112      std::vector<Vector3d> velocity;               /** velocity array */
113      std::vector<RotMat3x3d> aMat;            /** rotation matrix array */
114      std::vector<Vector3d> angularMomentum;/** angular momentum array (body-fixed) */
115      std::vector<Mat3x3d> electroFrame;                /** the lab frame unit std::vector array*/
116 <    std::vector<double> zAngle;              /** z -angle array */        
116 >    std::vector<RealType> zAngle;              /** z -angle array */        
117      std::vector<Vector3d> force;               /** force array */
118      std::vector<Vector3d> torque;               /** torque array */
119 +    std::vector<RealType> particlePot;         /** pair potential arrray */
120  
121      static int getBytesPerStuntDouble(int layout);
122  
123    private:
124  
125 <    double* internalGetArrayPointer(std::vector<Vector3d>& v);
125 >    RealType* internalGetArrayPointer(std::vector<Vector3d>& v);
126              
127 <    double* internalGetArrayPointer(std::vector<RotMat3x3d>& v);
128 <    double* internalGetArrayPointer(std::vector<double>& v);
127 >    RealType* internalGetArrayPointer(std::vector<RotMat3x3d>& v);
128 >    RealType* internalGetArrayPointer(std::vector<RealType>& v);
129 >
130              
131      template<typename T>
132      void internalResize(std::vector<T>& v, int newSize);

Diff Legend

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