ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/branches/new_design/OOPSE-3.0/src/brains/DataStorage.hpp
(Generate patch)

Comparing branches/new_design/OOPSE-3.0/src/brains/DataStorage.hpp (file contents):
Revision 1694, Thu Oct 28 22:34:02 2004 UTC vs.
Revision 1695 by tim, Mon Nov 1 22:52:57 2004 UTC

# Line 44 | Line 44 | using namespace oopse;
44      //forward declaration
45      class Snapshot;
46      class StuntDouble;
47 <    class DataStorageTestCase;
47 >
48      /**
49       * @class DataStorage
50       * @warning do not try to insert element into (or ease element from) private member data
# Line 97 | Line 97 | using namespace oopse;
97              void setStorageLayout(int layout);
98              /** Returns the pointer of internal array */
99              double *getArrayPointer(int whichArray);
100 –            friend class StuntDouble;
101 –            friend class DataStorageTestCase;
102 –        private:
100  
101 +            std::vector<Vector3d> position;               /** position array */
102 +            std::vector<Vector3d> velocity;               /** velocity array */
103 +            std::vector<RotMat3x3d> aMat;            /** rotation matrix array */
104 +            std::vector<Vector3d> angularMomentum;/** angular momentum array (body-fixed) */
105 +            std::vector<Vector3d> unitVector;                /** the lab frame unit std::vector array*/
106 +            std::vector<double> zAngle;              /** z -angle array */        
107 +            std::vector<Vector3d> force;               /** force array */
108 +            std::vector<Vector3d> torque;               /** torque array */
109  
110 +        private:
111 +
112              double* internalGetArrayPointer(std::vector<Vector3d>& v);
113              
114              double* internalGetArrayPointer(std::vector<RotMat3x3d>& v);
# Line 115 | Line 122 | using namespace oopse;
122              
123              int size_;
124              int storageLayout_;
125 <            std::vector<Vector3d> position;               /** position array */
119 <            std::vector<Vector3d> velocity;               /** velocity array */
120 <            std::vector<RotMat3x3d> aMat;            /** rotation matrix array */
121 <            std::vector<Vector3d> angularMomentum;/** angular momentum array (body-fixed) */
122 <            std::vector<Vector3d> unitVector;                /** the lab frame unit std::vector array*/
123 <            std::vector<double> zAngle;              /** z -angle array */        
124 <            std::vector<Vector3d> force;               /** force array */
125 <            std::vector<Vector3d> torque;               /** torque array */
125 >
126      };
127  
128  

Diff Legend

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