ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE/libmdtools/Thermo.cpp
(Generate patch)

Comparing trunk/OOPSE/libmdtools/Thermo.cpp (file contents):
Revision 447 by mmeineke, Thu Apr 3 20:21:54 2003 UTC vs.
Revision 468 by gezelter, Mon Apr 7 16:56:38 2003 UTC

# Line 129 | Line 129 | double Thermo::getTemperature(){
129  
130    const double kb = 1.9872179E-3; // boltzman's constant in kcal/(mol K)
131    double temperature;
132  int ndf_local, ndf;
132    
133 <  ndf_local = 3 * entry_plug->n_atoms + 3 * entry_plug->n_oriented
135 <    - entry_plug->n_constraints;
136 <
137 < #ifdef IS_MPI
138 <  MPI_Allreduce(&ndf_local,&ndf,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
139 < #else
140 <  ndf = ndf_local;
141 < #endif
142 <
143 <  ndf = ndf - 3;
144 <  
145 <  temperature = ( 2.0 * this->getKinetic() ) / ( ndf * kb );
133 >  temperature = ( 2.0 * this->getKinetic() ) / ((double)entry_plug->ndf * kb );
134    return temperature;
135   }
136  
# Line 151 | Line 139 | double Thermo::getPressure(){
139    // routine derived via viral theorem description in:
140    // Paci, E. and Marchi, M. J.Phys.Chem. 1996, 100, 4314-4322
141  
142 <  return 0.0;
142 >  const double convert = 4.184e-4;
143 >  double mtot;
144 >  double vcom[3];
145 >  double p_local, p_sum, p_mol, virial;
146 >  double theBox[3];
147 >  double* tau;
148 >  int i, nMols;
149 >  Molecule* molecules;
150 >
151 >  nMols = entry_plug->n_mol;
152 >  molecules = entry_plug->molecules;
153 >  tau = entry_plug->tau;
154 >
155 >  // use velocities of molecular centers of mass and molecular masses:
156 >  p_local = 0.0;
157 >  for (i=0; i < nMols; i++) {
158 >    molecules[i].getCOMvel(mtot, vcom);
159 >    p_local += mtot* (vcom[0]*vcom[0] + vcom[1]*vcom[1] + vcom[2]*vcom[2]);
160 >  }
161 >
162 >  // Get total for entire system from MPI.
163 > #ifdef IS_MPI
164 >  MPI_Allreduce(&p_local,&p_sum,1,MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
165 > #else
166 >  p_sum = p_local;
167 > #endif // is_mpi
168 >
169 >  virial = tau[0] + tau[4] + tau[8];
170 >  entry_plug->getBox(theBox);
171 >
172 >  p_mol = (p_sum - virial*convert) / (3.0 * theBox[0] * theBox[1]* theBox[2]);
173 >  
174 >  return p_mol;
175   }
176  
177   void Thermo::velocitize() {
# Line 165 | Line 185 | void Thermo::velocitize() {
185    const double kb = 8.31451e-7; // kb in amu, angstroms, fs, etc.
186    double av2;
187    double kebar;
168  int ndf, ndf_local; // number of degrees of freedom
169  int ndfRaw, ndfRaw_local; // the raw number of degrees of freedom
188    int n_atoms;
189    Atom** atoms;
190    DirectionalAtom* dAtom;
# Line 180 | Line 198 | void Thermo::velocitize() {
198    n_oriented    = entry_plug->n_oriented;
199    n_constraints = entry_plug->n_constraints;
200    
201 <  // Raw degrees of freedom that we have to set
202 <  ndfRaw_local = 3 * entry_plug->n_atoms + 3 * entry_plug->n_oriented;
185 <
186 <  // Degrees of freedom that can contain kinetic energy
187 <  ndf_local = 3 * entry_plug->n_atoms + 3 * entry_plug->n_oriented
188 <    - entry_plug->n_constraints;
201 >  kebar = kb * temperature * (double)entry_plug->ndf /
202 >    ( 2.0 * (double)entry_plug->ndfRaw );
203    
190 #ifdef IS_MPI
191  MPI_Allreduce(&ndf_local,&ndf,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
192  MPI_Allreduce(&ndfRaw_local,&ndfRaw,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
193 #else
194  ndfRaw = ndfRaw_local;
195  ndf = ndf_local;
196 #endif
197  ndf = ndf - 3;
198
199  kebar = kb * temperature * (double)ndf / ( 2.0 * (double)ndfRaw );
200  
204    for(vr = 0; vr < n_atoms; vr++){
205      
206      // uses equipartition theory to solve for vbar in angstrom/fs
# Line 253 | Line 256 | void Thermo::velocitize() {
256  
257          vbar = sqrt( 2.0 * kebar * dAtom->getIyy() );
258          jy = vbar * gaussStream->getGaussian();
259 <
259 >        
260          vbar = sqrt( 2.0 * kebar * dAtom->getIzz() );
261          jz = vbar * gaussStream->getGaussian();
262          

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines