ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-2.0/src/brains/Stats.cpp
(Generate patch)

Comparing trunk/OOPSE-2.0/src/brains/Stats.cpp (file contents):
Revision 2252 by chuckv, Mon May 30 14:01:52 2005 UTC vs.
Revision 2380 by tim, Mon Oct 17 23:13:44 2005 UTC

# Line 54 | Line 54 | namespace oopse {
54    bool Stats::isInit_ = false;
55    std::string Stats::title_[Stats::ENDINDEX - Stats::BEGININDEX];
56    std::string Stats::units_[Stats::ENDINDEX - Stats::BEGININDEX];
57 <
57 >  Stats::StatsMapType Stats::statsMap;
58    Stats::Stats() {
59  
60      if (!isInit_) {
# Line 79 | Line 79 | namespace oopse {
79      Stats::title_[LONG_RANGE_POTENTIAL] = "Long Range Potential";
80      Stats::title_[SHORT_RANGE_POTENTIAL] = "Short Range Potential";
81      Stats::title_[VANDERWAALS_POTENTIAL] = "van der waals Potential";
82 +    Stats::title_[ELECTROSTATIC_POTENTIAL] = "Electrostatic Potential";    
83      Stats::title_[BOND_POTENTIAL] = "Bond Potential";
84      Stats::title_[BEND_POTENTIAL] = "Bend Potential";
85      Stats::title_[DIHEDRAL_POTENTIAL] = "Dihedral Potential";
# Line 102 | Line 103 | namespace oopse {
103      Stats::units_[LONG_RANGE_POTENTIAL] = "kcal/mol";
104      Stats::units_[SHORT_RANGE_POTENTIAL] = "kcal/mol";
105      Stats::units_[VANDERWAALS_POTENTIAL] = "kcal/mol";
106 +    Stats::units_[ELECTROSTATIC_POTENTIAL] = "kcal/mol";
107      Stats::units_[BOND_POTENTIAL] = "kcal/mol";
108      Stats::units_[BEND_POTENTIAL] = "kcal/mol";
109      Stats::units_[DIHEDRAL_POTENTIAL] = "kcal/mol";
# Line 111 | Line 113 | namespace oopse {
113      Stats::units_[PRESSURE_TENSOR_X] = "amu*fs^-2*Ang^-1";
114      Stats::units_[PRESSURE_TENSOR_Y] = "amu*fs^-2*Ang^-1";
115      Stats::units_[PRESSURE_TENSOR_Z] = "amu*fs^-2*Ang^-1";
116 +
117 +    Stats::statsMap.insert(StatsMapType::value_type("TIME", TIME));
118 +    Stats::statsMap.insert(StatsMapType::value_type("TOTAL_ENERGY", TOTAL_ENERGY));
119 +    Stats::statsMap.insert(StatsMapType::value_type("POTENTIAL_ENERGY", POTENTIAL_ENERGY));
120 +    Stats::statsMap.insert(StatsMapType::value_type("KINETIC_ENERGY", KINETIC_ENERGY));
121 +    Stats::statsMap.insert(StatsMapType::value_type("TEMPERATURE", TEMPERATURE));
122 +    Stats::statsMap.insert(StatsMapType::value_type("PRESSURE", PRESSURE));
123 +    Stats::statsMap.insert(StatsMapType::value_type("VOLUME", VOLUME));
124 +    Stats::statsMap.insert(StatsMapType::value_type("CONSERVED_QUANTITY", CONSERVED_QUANTITY));
125 +    Stats::statsMap.insert(StatsMapType::value_type("TRANSLATIONAL_KINETIC", TRANSLATIONAL_KINETIC));
126 +    Stats::statsMap.insert(StatsMapType::value_type("ROTATIONAL_KINETIC", ROTATIONAL_KINETIC));
127 +    Stats::statsMap.insert(StatsMapType::value_type("LONG_RANGE_POTENTIAL", LONG_RANGE_POTENTIAL));
128 +    Stats::statsMap.insert(StatsMapType::value_type("SHORT_RANGE_POTENTIAL", SHORT_RANGE_POTENTIAL));
129 +    Stats::statsMap.insert(StatsMapType::value_type("VANDERWAALS_POTENTIAL", VANDERWAALS_POTENTIAL));
130 +    Stats::statsMap.insert(StatsMapType::value_type("ELECTROSTATIC_POTENTIAL", ELECTROSTATIC_POTENTIAL));
131 +    Stats::statsMap.insert(StatsMapType::value_type("BOND_POTENTIAL", BOND_POTENTIAL));
132 +    Stats::statsMap.insert(StatsMapType::value_type("BEND_POTENTIAL", BEND_POTENTIAL));
133 +    Stats::statsMap.insert(StatsMapType::value_type("DIHEDRAL_POTENTIAL", DIHEDRAL_POTENTIAL));
134 +    Stats::statsMap.insert(StatsMapType::value_type("IMPROPER_POTENTIAL", IMPROPER_POTENTIAL));
135 +    Stats::statsMap.insert(StatsMapType::value_type("VRAW", VRAW));    
136 +    Stats::statsMap.insert(StatsMapType::value_type("VHARM", VHARM));    
137 +    Stats::statsMap.insert(StatsMapType::value_type("PRESSURE_TENSOR_X", PRESSURE_TENSOR_X));    
138 +    Stats::statsMap.insert(StatsMapType::value_type("PRESSURE_TENSOR_Y", PRESSURE_TENSOR_Y));    
139 +    Stats::statsMap.insert(StatsMapType::value_type("PRESSURE_TENSOR_Z", PRESSURE_TENSOR_Z));    
140    }
141  
142   }

Diff Legend

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