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 555 by chuckv, Mon May 30 14:01:52 2005 UTC vs.
Revision 1275 by cli2, Fri Jul 4 20:54:29 2008 UTC

# Line 51 | Line 51
51   #define BRAINS_STATS_HPP
52  
53   #include <string>
54 + #include <map>
55  
56   #include "math/SquareMatrix3.hpp"
57   namespace oopse {
# Line 69 | Line 70 | namespace oopse {
70        TEMPERATURE,
71        PRESSURE,
72        VOLUME,
73 +                        HULLVOLUME,
74 +                        GYRVOLUME,
75        CONSERVED_QUANTITY,            
76        TRANSLATIONAL_KINETIC,
77        ROTATIONAL_KINETIC,
# Line 79 | 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        ENDINDEX  //internal use
101      };
102  
103      Stats();
104 <    const double& operator [](int index) const {
104 >    const RealType& operator [](int index) const {
105        assert(index >=0 && index < ENDINDEX);
106        return data_[index];
107      }
108  
109 <    double& operator [](int index){
109 >    RealType& operator [](int index){
110        assert(index >=0 && index < ENDINDEX);            
111        return data_[index];
112      }
# Line 116 | Line 128 | namespace oopse {
128      void setTau(const Mat3x3d& tau) {
129        tau_ = tau;
130      }
131 <        
131 >
132 >    typedef std::map<std::string, Stats::StatsIndex> StatsMapType;
133 >    static  StatsMapType statsMap;
134 >  
135    private:
136      static void init();
137      static bool isInit_;
138 <    double data_[ENDINDEX - BEGININDEX];
138 >    RealType data_[ENDINDEX - BEGININDEX];
139      static std::string title_[ENDINDEX - BEGININDEX];
140      static std::string units_[ENDINDEX - BEGININDEX];
141      Mat3x3d tau_;
142    };
143  
144 +
145 +
146   } //end namespace oopse
147   #endif //BRAINS_STATS_HPP

Diff Legend

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