--- trunk/mdtools/md_code/Thermo.cpp	2003/01/03 22:04:50	223
+++ trunk/mdtools/md_code/Thermo.cpp	2003/02/04 20:16:08	264
@@ -1,5 +1,11 @@
 #include <cmath>
+#include <iostream>
+using namespace std;
+
+#ifdef IS_MPI
+#include <mpi.h>
 #include <mpi++.h>
+#endif //is_mpi
 
 #include "Thermo.hpp"
 #include "SRI.hpp"
@@ -10,7 +16,8 @@ Thermo::Thermo( SimInfo* the_entry_plug ) { 
 
 Thermo::Thermo( SimInfo* the_entry_plug ) { 
   entry_plug = the_entry_plug;
-  baseSeed = BASE_SEED;
+  int baseSeed = BASE_SEED;
+  
   gaussStream = new gaussianSPRNG( baseSeed );
 }
 
@@ -60,9 +67,9 @@ double Thermo::getKinetic(){
     }
   }
 #ifdef IS_MPI
-  MPI_COMM_WORLD.Allreduce(&kinetic,&kinetic_global,1,MPI_DOUBLE,MPI_SUM);
+  MPI::COMM_WORLD.Allreduce(&kinetic,&kinetic_global,1,MPI_DOUBLE,MPI_SUM);
   kinetic = kinetic_global;
-#endif
+#endif //is_mpi
 
   kinetic = kinetic * 0.5 / e_convert;
 
@@ -81,7 +88,7 @@ double Thermo::getPotential(){
 
   potential = 0.0;
   potential_global = 0.0;
-  potential += entry_plug->longRange->get_potential();;
+  potential += entry_plug->lrPot;
 
   // std::cerr << "long range potential: " << potential << "\n";
   for( el=0; el<nSRI; el++ ){
@@ -91,9 +98,10 @@ double Thermo::getPotential(){
 
   // Get total potential for entire system from MPI.
 #ifdef IS_MPI
-  MPI_COMM_WORLD.Allreduce(&potential,&potential_global,1,MPI_DOUBLE,MPI_SUM);
+  MPI::COMM_WORLD.Allreduce(&potential,&potential_global,1,MPI_DOUBLE,MPI_SUM);
   potential = potential_global;
-#endif
+ 
+#endif // is_mpi
 
   return potential;
 }
@@ -178,11 +186,13 @@ void Thermo::velocitize() {
        single processor version of the code, but SPRNG should
        still be preferred for consistency.
     */
+
 #ifdef IS_MPI
 #error "SPRNG random number generator must be used for MPI"
 #else
-#warning "Using drand48 for random number generation"
-#endif   
+    // warning "Using drand48 for random number generation"
+#endif  // is_mpi 
+
     x = drand48();
     y = drand48();
     vx = vbar * sqrt( -2.0 * log(x)) * cos(2 * M_PI * y);
@@ -194,13 +204,14 @@ void Thermo::velocitize() {
     x = drand48();
     y = drand48();
     vz = vbar * sqrt( -2.0 * log(x)) * cos(2 * M_PI * y);
-#endif
 
+#endif // use_spring
+
 #ifdef USE_SPRNG
     vx = vbar * gaussStream->getGaussian();
     vy = vbar * gaussStream->getGaussian();
     vz = vbar * gaussStream->getGaussian();
-#endif
+#endif // use_spring
 
     atoms[vr]->set_vx( vx ); 
     atoms[vr]->set_vy( vy );
@@ -249,11 +260,14 @@ void Thermo::velocitize() {
       if( atoms[i]->isDirectional() ){
 	
 	dAtom = (DirectionalAtom *)atoms[i];
+
+#ifndef USE_SPRNG
+
 #ifdef IS_MPI
 #error "SPRNG random number generator must be used for MPI"
-#else
-#warning "Using drand48 for random number generation"
-#endif   
+#else  // is_mpi
+	//warning "Using drand48 for random number generation"
+#endif   // is_MPI
 	
 	vbar = sqrt( 2.0 * kebar * dAtom->getIxx() );
 	x = drand48();
@@ -269,8 +283,9 @@ void Thermo::velocitize() {
 	x = drand48();
 	y = drand48();
 	jz = vbar * sqrt( -2.0 * log(x)) * cos(2 * M_PI * y);
-#endif
-#ifdef USE_SPRNG
+
+#else //use_sprng
+
 	vbar = sqrt( 2.0 * kebar * dAtom->getIxx() );
 	jx = vbar * gaussStream->getGaussian();
 
@@ -279,7 +294,7 @@ void Thermo::velocitize() {
 
 	vbar = sqrt( 2.0 * kebar * dAtom->getIzz() );
 	jz = vbar * gaussStream->getGaussian();
-#endif
+#endif //use_sprng
 	
 	dAtom->setJx( jx );
 	dAtom->setJy( jy );