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

Comparing trunk/src/brains/Stats.hpp (file contents):
Revision 681 by tim, Mon Oct 17 23:13:44 2005 UTC vs.
Revision 1291 by gezelter, Thu Sep 11 19:40:59 2008 UTC

# Line 70 | Line 70 | namespace oopse {
70        TEMPERATURE,
71        PRESSURE,
72        VOLUME,
73 +      HULLVOLUME,
74 +      GYRVOLUME,
75        CONSERVED_QUANTITY,            
76        TRANSLATIONAL_KINETIC,
77        ROTATIONAL_KINETIC,
# Line 80 | Line 82 | namespace oopse {
82        BOND_POTENTIAL,
83        BEND_POTENTIAL,
84        DIHEDRAL_POTENTIAL,
85 <      IMPROPER_POTENTIAL,
85 >      INVERSION_POTENTIAL,
86        VRAW,
87        VHARM,
88 <      PRESSURE_TENSOR_X,
89 <      PRESSURE_TENSOR_Y,
90 <      PRESSURE_TENSOR_Z,  
88 >      PRESSURE_TENSOR_XX,
89 >      PRESSURE_TENSOR_XY,
90 >      PRESSURE_TENSOR_XZ,
91 >      PRESSURE_TENSOR_YX,
92 >      PRESSURE_TENSOR_YY,
93 >      PRESSURE_TENSOR_YZ,
94 >      PRESSURE_TENSOR_ZX,
95 >      PRESSURE_TENSOR_ZY,
96 >      PRESSURE_TENSOR_ZZ,
97 >      BOX_DIPOLE_X,
98 >      BOX_DIPOLE_Y,
99 >      BOX_DIPOLE_Z,
100 >      TAGGED_PAIR_DISTANCE,
101        ENDINDEX  //internal use
102      };
103  
104      Stats();
105 <    const double& operator [](int index) const {
105 >    const RealType& operator [](int index) const {
106        assert(index >=0 && index < ENDINDEX);
107        return data_[index];
108      }
109  
110 <    double& operator [](int index){
110 >    RealType& operator [](int index){
111        assert(index >=0 && index < ENDINDEX);            
112        return data_[index];
113      }
# Line 124 | Line 136 | namespace oopse {
136    private:
137      static void init();
138      static bool isInit_;
139 <    double data_[ENDINDEX - BEGININDEX];
139 >    RealType data_[ENDINDEX - BEGININDEX];
140      static std::string title_[ENDINDEX - BEGININDEX];
141      static std::string units_[ENDINDEX - BEGININDEX];
142      Mat3x3d tau_;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines