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

Comparing trunk/src/brains/Stats.cpp (file contents):
Revision 1126 by gezelter, Fri Apr 6 21:53:43 2007 UTC vs.
Revision 1291 by gezelter, Thu Sep 11 19:40:59 2008 UTC

# Line 73 | Line 73 | namespace oopse {
73      Stats::title_[TEMPERATURE] = "Temperature";
74      Stats::title_[PRESSURE] = "Pressure";
75      Stats::title_[VOLUME] = "Volume";
76 +    Stats::title_[HULLVOLUME] = "Hull Volume";
77 +    Stats::title_[GYRVOLUME] = "Gyrational Volume";
78      Stats::title_[CONSERVED_QUANTITY] = "Conserved Quantity";            
79      Stats::title_[TRANSLATIONAL_KINETIC] = "Translational Kinetic";
80      Stats::title_[ROTATIONAL_KINETIC] = "Rotational Kinetic";
# Line 83 | Line 85 | namespace oopse {
85      Stats::title_[BOND_POTENTIAL] = "Bond Potential";
86      Stats::title_[BEND_POTENTIAL] = "Bend Potential";
87      Stats::title_[DIHEDRAL_POTENTIAL] = "Dihedral Potential";
88 <    Stats::title_[IMPROPER_POTENTIAL] = "Improper Potential";
88 >    Stats::title_[INVERSION_POTENTIAL] = "Inversion Potential";
89      Stats::title_[VRAW] = "Raw Potential";
90      Stats::title_[VHARM] = "Harmonic Potential";
91      Stats::title_[PRESSURE_TENSOR_XX] = "P_xx";
# Line 98 | Line 100 | namespace oopse {
100      Stats::title_[BOX_DIPOLE_X] = "box dipole x";
101      Stats::title_[BOX_DIPOLE_Y] = "box dipole y";
102      Stats::title_[BOX_DIPOLE_Z] = "box dipole z";
103 <
103 >    Stats::title_[TAGGED_PAIR_DISTANCE] = "Tagged_Pair_Distance";
104 >    
105      Stats::units_[TIME] = "fs";
106      Stats::units_[TOTAL_ENERGY] = "kcal/mol";
107      Stats::units_[POTENTIAL_ENERGY] = "kcal/mol";
# Line 106 | Line 109 | namespace oopse {
109      Stats::units_[TEMPERATURE] = "K";
110      Stats::units_[PRESSURE] = "atm";
111      Stats::units_[VOLUME] = "A^3";
112 +    Stats::units_[HULLVOLUME] = "A^3";
113 +    Stats::units_[GYRVOLUME] = "A^3";
114      Stats::units_[CONSERVED_QUANTITY] = "kcal/mol";            
115      Stats::units_[TRANSLATIONAL_KINETIC] = "kcal/mol";
116      Stats::units_[ROTATIONAL_KINETIC] = "kcal/mol";
# Line 116 | Line 121 | namespace oopse {
121      Stats::units_[BOND_POTENTIAL] = "kcal/mol";
122      Stats::units_[BEND_POTENTIAL] = "kcal/mol";
123      Stats::units_[DIHEDRAL_POTENTIAL] = "kcal/mol";
124 <    Stats::units_[IMPROPER_POTENTIAL] = "kcal/mol";
124 >    Stats::units_[INVERSION_POTENTIAL] = "kcal/mol";
125      Stats::units_[VRAW] = "kcal/mol";
126      Stats::units_[VHARM] = "kcal/mol";
127      Stats::units_[PRESSURE_TENSOR_XX] = "amu*fs^-2*Ang^-1";
# Line 131 | Line 136 | namespace oopse {
136      Stats::units_[BOX_DIPOLE_X] = "C*m";
137      Stats::units_[BOX_DIPOLE_Y] = "C*m";
138      Stats::units_[BOX_DIPOLE_Z] = "C*m";
139 +    Stats::units_[TAGGED_PAIR_DISTANCE] = "Ang";
140  
141      Stats::statsMap.insert(StatsMapType::value_type("TIME", TIME));
142      Stats::statsMap.insert(StatsMapType::value_type("TOTAL_ENERGY", TOTAL_ENERGY));
# Line 149 | Line 155 | namespace oopse {
155      Stats::statsMap.insert(StatsMapType::value_type("BOND_POTENTIAL", BOND_POTENTIAL));
156      Stats::statsMap.insert(StatsMapType::value_type("BEND_POTENTIAL", BEND_POTENTIAL));
157      Stats::statsMap.insert(StatsMapType::value_type("DIHEDRAL_POTENTIAL", DIHEDRAL_POTENTIAL));
158 <    Stats::statsMap.insert(StatsMapType::value_type("IMPROPER_POTENTIAL", IMPROPER_POTENTIAL));
158 >    Stats::statsMap.insert(StatsMapType::value_type("INVERSION_POTENTIAL", INVERSION_POTENTIAL));
159      Stats::statsMap.insert(StatsMapType::value_type("VRAW", VRAW));    
160      Stats::statsMap.insert(StatsMapType::value_type("VHARM", VHARM));    
161      Stats::statsMap.insert(StatsMapType::value_type("PRESSURE_TENSOR_XX", PRESSURE_TENSOR_XX));    
# Line 164 | Line 170 | namespace oopse {
170      Stats::statsMap.insert(StatsMapType::value_type("BOX_DIPOLE_X", BOX_DIPOLE_X));    
171      Stats::statsMap.insert(StatsMapType::value_type("BOX_DIPOLE_Y", BOX_DIPOLE_Y));    
172      Stats::statsMap.insert(StatsMapType::value_type("BOX_DIPOLE_Z", BOX_DIPOLE_Z));    
173 +    Stats::statsMap.insert(StatsMapType::value_type("TAGGED_PAIR_DISTANCE", TAGGED_PAIR_DISTANCE));    
174    }
175  
176   }

Diff Legend

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