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

Comparing branches/new_design/OOPSE-3.0/src/brains/Stats.hpp (file contents):
Revision 1725 by tim, Tue Nov 9 23:11:39 2004 UTC vs.
Revision 1726 by tim, Wed Nov 10 22:50:03 2004 UTC

# Line 44 | Line 44 | class Stats{
44   class Stats{
45      public:
46          enum StatsIndex {
47 <            BEGININDEX = 0,  //internal use        
48 <            TOTALENERGY = BEGININDEX,
49 <            TOTALPOTENTIAL,
50 <            TOTALKINETIC,
47 >            BEGININDEX = 0,  //internal use
48 >            TIME = BEGININDEX,
49 >            TOTAL_ENERGY,
50 >            POTENTIAL_ENERGY,
51 >            KINETIC_ENERGY,
52              TEMPERATURE,
53              PRESSURE,
54 <            CONSERVEQUAN,            
55 <            TRANSLATIONALKINETIC,
56 <            ROTATIONALKINETIC,
57 <            LONGRANGEPOTENTIAL,
58 <            SHORTRANGEPOTENTIAL,
59 <            OTHERPOTENTIAL,
60 <            VANDERWAALS,
61 <            ELECTROSTATIC,
62 <            BOND,
63 <            BEND,
64 <            DIHEDRAL,
64 <            IMPROPER,
54 >            CONSERVED_QUANTITY,            
55 >            TRANSLATIONAL_KINETIC,
56 >            ROTATIONAL_KINETIC,
57 >            LONG_RANGE_POTENTIAL,
58 >            SHORT_RANGE_POTENTIAL,
59 >            VANDERWAALS_POTENTIAL,
60 >            ELECTROSTATIC_POTENTIAL,
61 >            BOND_POTENTIAL,
62 >            BEND_POTENTIAL,
63 >            DIHEDRAL_POTENTIAL,
64 >            IMPROPER_POTENTIAL,
65              VRAW,
66              VHARM,
67            TAUXX,
68            TAUXY,
69            TAUXZ,
70            TAUYX,
71            TAUYY,
72            TAUYZ,
73            TAUZX,
74            TAUZY,
75            TAUZZ,
67              ENDINDEX  //internal use
68          };
69  
# Line 87 | Line 78 | class Stats{
78          static std::string getTitle(StatsIndex index) {
79              return title_[static_cast<int>(index)];
80          }
81 +
82 +        static std::string getUnits(StatsIndex index) {
83 +            return units_[static_cast<int>(index)];
84 +        }
85          
86      private:
87          
88          double data_[ENDINDEX - BEGININDEX];
89          static std::string title_[ENDINDEX - BEGININDEX];
90 +        static std::string units_[ENDINDEX - BEGININDEX];
91   };
92  
93   } //end namespace oopse

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines