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

Comparing trunk/src/brains/Stats.cpp (file contents):
Revision 681 by tim, Mon Oct 17 23:13:44 2005 UTC vs.
Revision 1328 by gezelter, Fri Mar 13 20:26:32 2009 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_X] = "presure tensor x";
92 <    Stats::title_[PRESSURE_TENSOR_Y] = "presure tensor y";
93 <    Stats::title_[PRESSURE_TENSOR_Z] = "presure tensor z";
94 <
91 >    Stats::title_[PRESSURE_TENSOR_XX] = "P_xx";
92 >    Stats::title_[PRESSURE_TENSOR_XY] = "P_xy";
93 >    Stats::title_[PRESSURE_TENSOR_XZ] = "P_xz";
94 >    Stats::title_[PRESSURE_TENSOR_YX] = "P_yx";
95 >    Stats::title_[PRESSURE_TENSOR_YY] = "P_yy";
96 >    Stats::title_[PRESSURE_TENSOR_YZ] = "P_yz";
97 >    Stats::title_[PRESSURE_TENSOR_ZX] = "P_zx";
98 >    Stats::title_[PRESSURE_TENSOR_ZY] = "P_zy";
99 >    Stats::title_[PRESSURE_TENSOR_ZZ] = "P_zz";
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 >    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 97 | 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 107 | 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_X] = "amu*fs^-2*Ang^-1";
128 <    Stats::units_[PRESSURE_TENSOR_Y] = "amu*fs^-2*Ang^-1";
129 <    Stats::units_[PRESSURE_TENSOR_Z] = "amu*fs^-2*Ang^-1";
127 >    Stats::units_[PRESSURE_TENSOR_XX] = "amu*fs^-2*Ang^-1";
128 >    Stats::units_[PRESSURE_TENSOR_XY] = "amu*fs^-2*Ang^-1";
129 >    Stats::units_[PRESSURE_TENSOR_XZ] = "amu*fs^-2*Ang^-1";
130 >    Stats::units_[PRESSURE_TENSOR_YX] = "amu*fs^-2*Ang^-1";
131 >    Stats::units_[PRESSURE_TENSOR_YY] = "amu*fs^-2*Ang^-1";
132 >    Stats::units_[PRESSURE_TENSOR_YZ] = "amu*fs^-2*Ang^-1";
133 >    Stats::units_[PRESSURE_TENSOR_ZX] = "amu*fs^-2*Ang^-1";
134 >    Stats::units_[PRESSURE_TENSOR_ZY] = "amu*fs^-2*Ang^-1";
135 >    Stats::units_[PRESSURE_TENSOR_ZZ] = "amu*fs^-2*Ang^-1";
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 >    Stats::units_[RNEMD_SWAP_TOTAL] = "Variable";
141  
142      Stats::statsMap.insert(StatsMapType::value_type("TIME", TIME));
143      Stats::statsMap.insert(StatsMapType::value_type("TOTAL_ENERGY", TOTAL_ENERGY));
# Line 121 | Line 146 | namespace oopse {
146      Stats::statsMap.insert(StatsMapType::value_type("TEMPERATURE", TEMPERATURE));
147      Stats::statsMap.insert(StatsMapType::value_type("PRESSURE", PRESSURE));
148      Stats::statsMap.insert(StatsMapType::value_type("VOLUME", VOLUME));
149 +    Stats::statsMap.insert(StatsMapType::value_type("HULLVOLUME", HULLVOLUME));
150 +    Stats::statsMap.insert(StatsMapType::value_type("GYRVOLUME", GYRVOLUME));
151      Stats::statsMap.insert(StatsMapType::value_type("CONSERVED_QUANTITY", CONSERVED_QUANTITY));
152      Stats::statsMap.insert(StatsMapType::value_type("TRANSLATIONAL_KINETIC", TRANSLATIONAL_KINETIC));
153      Stats::statsMap.insert(StatsMapType::value_type("ROTATIONAL_KINETIC", ROTATIONAL_KINETIC));
# Line 131 | Line 158 | namespace oopse {
158      Stats::statsMap.insert(StatsMapType::value_type("BOND_POTENTIAL", BOND_POTENTIAL));
159      Stats::statsMap.insert(StatsMapType::value_type("BEND_POTENTIAL", BEND_POTENTIAL));
160      Stats::statsMap.insert(StatsMapType::value_type("DIHEDRAL_POTENTIAL", DIHEDRAL_POTENTIAL));
161 <    Stats::statsMap.insert(StatsMapType::value_type("IMPROPER_POTENTIAL", IMPROPER_POTENTIAL));
161 >    Stats::statsMap.insert(StatsMapType::value_type("INVERSION_POTENTIAL", INVERSION_POTENTIAL));
162      Stats::statsMap.insert(StatsMapType::value_type("VRAW", VRAW));    
163      Stats::statsMap.insert(StatsMapType::value_type("VHARM", VHARM));    
164 <    Stats::statsMap.insert(StatsMapType::value_type("PRESSURE_TENSOR_X", PRESSURE_TENSOR_X));    
165 <    Stats::statsMap.insert(StatsMapType::value_type("PRESSURE_TENSOR_Y", PRESSURE_TENSOR_Y));    
166 <    Stats::statsMap.insert(StatsMapType::value_type("PRESSURE_TENSOR_Z", PRESSURE_TENSOR_Z));    
164 >    Stats::statsMap.insert(StatsMapType::value_type("PRESSURE_TENSOR_XX", PRESSURE_TENSOR_XX));    
165 >    Stats::statsMap.insert(StatsMapType::value_type("PRESSURE_TENSOR_XY", PRESSURE_TENSOR_XY));    
166 >    Stats::statsMap.insert(StatsMapType::value_type("PRESSURE_TENSOR_XZ", PRESSURE_TENSOR_XZ));    
167 >    Stats::statsMap.insert(StatsMapType::value_type("PRESSURE_TENSOR_YX", PRESSURE_TENSOR_YX));    
168 >    Stats::statsMap.insert(StatsMapType::value_type("PRESSURE_TENSOR_YY", PRESSURE_TENSOR_YY));    
169 >    Stats::statsMap.insert(StatsMapType::value_type("PRESSURE_TENSOR_YZ", PRESSURE_TENSOR_YZ));    
170 >    Stats::statsMap.insert(StatsMapType::value_type("PRESSURE_TENSOR_ZX", PRESSURE_TENSOR_ZX));    
171 >    Stats::statsMap.insert(StatsMapType::value_type("PRESSURE_TENSOR_ZY", PRESSURE_TENSOR_ZY));    
172 >    Stats::statsMap.insert(StatsMapType::value_type("PRESSURE_TENSOR_ZZ", PRESSURE_TENSOR_ZZ));    
173 >    Stats::statsMap.insert(StatsMapType::value_type("BOX_DIPOLE_X", BOX_DIPOLE_X));    
174 >    Stats::statsMap.insert(StatsMapType::value_type("BOX_DIPOLE_Y", BOX_DIPOLE_Y));    
175 >    Stats::statsMap.insert(StatsMapType::value_type("BOX_DIPOLE_Z", BOX_DIPOLE_Z));    
176 >    Stats::statsMap.insert(StatsMapType::value_type("TAGGED_PAIR_DISTANCE", TAGGED_PAIR_DISTANCE));    
177 >    Stats::statsMap.insert(StatsMapType::value_type("RNEMD_SWAP_TOTAL", RNEMD_SWAP_TOTAL));    
178    }
179  
180   }

Diff Legend

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