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

Comparing trunk/mdtools/md_code/Thermo.cpp (file contents):
Revision 252 by chuckv, Tue Jan 28 22:16:55 2003 UTC vs.
Revision 261 by chuckv, Mon Feb 3 21:15:59 2003 UTC

# Line 1 | Line 1
1   #include <cmath>
2   #include <iostream>
3 + using namespace std;
4  
4 –
5   #ifdef IS_MPI
6 + #include <mpi.h>
7   #include <mpi++.h>
8   #endif //is_mpi
9  
# Line 16 | Line 17 | Thermo::Thermo( SimInfo* the_entry_plug ) {
17   Thermo::Thermo( SimInfo* the_entry_plug ) {
18    entry_plug = the_entry_plug;
19    int baseSeed = BASE_SEED;
20 +  
21    gaussStream = new gaussianSPRNG( baseSeed );
22   }
23  
# Line 65 | Line 67 | double Thermo::getKinetic(){
67      }
68    }
69   #ifdef IS_MPI
70 <  MPI_COMM_WORLD.Allreduce(&kinetic,&kinetic_global,1,MPI_DOUBLE,MPI_SUM);
70 >  MPI::COMM_WORLD.Allreduce(&kinetic,&kinetic_global,1,MPI_DOUBLE,MPI_SUM);
71    kinetic = kinetic_global;
72   #endif //is_mpi
73  
# Line 96 | Line 98 | double Thermo::getPotential(){
98  
99    // Get total potential for entire system from MPI.
100   #ifdef IS_MPI
101 <  MPI_COMM_WORLD.Allreduce(&potential,&potential_global,1,MPI_DOUBLE,MPI_SUM);
101 >  MPI::COMM_WORLD.Allreduce(&potential,&potential_global,1,MPI_DOUBLE,MPI_SUM);
102    potential = potential_global;
103   #endif // is_mpi
104  
# Line 164 | Line 166 | void Thermo::velocitize() {
166    ndf = ndfRaw - n_constraints - 3;
167    kebar = kb * temperature * (double)ndf / ( 2.0 * (double)ndfRaw );
168    
167 –  printf("Entered Velocitize\n");
169    for(vr = 0; vr < n_atoms; vr++){
170      
171      // uses equipartition theory to solve for vbar in angstrom/fs
# Line 188 | Line 189 | void Thermo::velocitize() {
189   #ifdef IS_MPI
190   #error "SPRNG random number generator must be used for MPI"
191   #else
192 < #warning "Using drand48 for random number generation"
192 >    // warning "Using drand48 for random number generation"
193   #endif  // is_mpi
194  
195      x = drand48();
# Line 202 | Line 203 | void Thermo::velocitize() {
203      x = drand48();
204      y = drand48();
205      vz = vbar * sqrt( -2.0 * log(x)) * cos(2 * M_PI * y);
206 <    printf("Setting new velocities vx: %f\n",vx);
206 >
207   #endif // use_spring
208  
209   #ifdef USE_SPRNG
# Line 264 | Line 265 | void Thermo::velocitize() {
265   #ifdef IS_MPI
266   #error "SPRNG random number generator must be used for MPI"
267   #else  // is_mpi
268 < #warning "Using drand48 for random number generation"
268 >        //warning "Using drand48 for random number generation"
269   #endif   // is_MPI
270          
271          vbar = sqrt( 2.0 * kebar * dAtom->getIxx() );

Diff Legend

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