--- branches/development/src/brains/SimInfo.cpp	2012/08/20 17:51:39	1779
+++ branches/development/src/brains/SimInfo.cpp	2013/01/09 19:27:52	1825
@@ -268,8 +268,9 @@ namespace OpenMD {
     ndf_local -= nConstraints_;
 
 #ifdef IS_MPI
-    MPI_Allreduce(&ndf_local,&ndf_,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
-    MPI_Allreduce(&nfq_local,&nGlobalFluctuatingCharges_,1, MPI_INT, MPI_SUM, MPI_COMM_WORLD);
+    MPI::COMM_WORLD.Allreduce(&ndf_local, &ndf_, 1, MPI::INT,MPI::SUM);
+    MPI::COMM_WORLD.Allreduce(&nfq_local, &nGlobalFluctuatingCharges_, 1,
+                              MPI::INT, MPI::SUM);
 #else
     ndf_ = ndf_local;
     nGlobalFluctuatingCharges_ = nfq_local;
@@ -283,7 +284,7 @@ namespace OpenMD {
 
   int SimInfo::getFdf() {
 #ifdef IS_MPI
-    MPI_Allreduce(&fdf_local,&fdf_,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
+    MPI::COMM_WORLD.Allreduce(&fdf_local, &fdf_, 1, MPI::INT, MPI::SUM);
 #else
     fdf_ = fdf_local;
 #endif
@@ -339,7 +340,7 @@ namespace OpenMD {
     }
     
 #ifdef IS_MPI
-    MPI_Allreduce(&ndfRaw_local,&ndfRaw_,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
+    MPI::COMM_WORLD.Allreduce(&ndfRaw_local, &ndfRaw_, 1, MPI::INT, MPI::SUM);
 #else
     ndfRaw_ = ndfRaw_local;
 #endif
@@ -352,7 +353,8 @@ namespace OpenMD {
 
 
 #ifdef IS_MPI
-    MPI_Allreduce(&ndfTrans_local,&ndfTrans_,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
+    MPI::COMM_WORLD.Allreduce(&ndfTrans_local, &ndfTrans_, 1, 
+                              MPI::INT, MPI::SUM);
 #else
     ndfTrans_ = ndfTrans_local;
 #endif
@@ -877,7 +879,6 @@ namespace OpenMD {
 
 
   void SimInfo::prepareTopology() {
-    int nExclude, nOneTwo, nOneThree, nOneFour;
 
     //calculate mass ratio of cutoff group
     SimInfo::MoleculeIterator mi;
@@ -925,11 +926,6 @@ namespace OpenMD {
     }    
     
     //scan topology 
-
-    nExclude = excludedInteractions_.getSize();
-    nOneTwo = oneTwoInteractions_.getSize();
-    nOneThree = oneThreeInteractions_.getSize();
-    nOneFour = oneFourInteractions_.getSize();
 
     int* excludeList = excludedInteractions_.getPairList();
     int* oneTwoList = oneTwoInteractions_.getPairList();
@@ -1025,8 +1021,8 @@ namespace OpenMD {
   int SimInfo::getNGlobalConstraints() {
     int nGlobalConstraints;
 #ifdef IS_MPI
-    MPI_Allreduce(&nConstraints_, &nGlobalConstraints, 1, MPI_INT, MPI_SUM,
-                  MPI_COMM_WORLD);    
+    MPI::COMM_WORLD.Allreduce(&nConstraints_, &nGlobalConstraints, 1, 
+                              MPI::INT, MPI::SUM);
 #else
     nGlobalConstraints =  nConstraints_;
 #endif