--- trunk/src/brains/ForceManager.cpp	2013/08/07 15:24:16	1925
+++ trunk/src/brains/ForceManager.cpp	2014/02/26 14:14:50	1969
@@ -637,14 +637,23 @@ namespace OpenMD {
     // Collect from all nodes.  This should eventually be moved into a
     // SystemDecomposition, but this is a better place than in
     // Thermo to do the collection.
-    MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &bondPotential, 1, MPI::REALTYPE, 
-                              MPI::SUM);
-    MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &bendPotential, 1, MPI::REALTYPE, 
-                              MPI::SUM);
-    MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &torsionPotential, 1, 
-                              MPI::REALTYPE, MPI::SUM);
-    MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &inversionPotential, 1, 
-                              MPI::REALTYPE, MPI::SUM);
+
+    MPI_Allreduce(MPI_IN_PLACE, &bondPotential, 1, MPI_REALTYPE, 
+                  MPI_SUM, MPI_COMM_WORLD);
+    MPI_Allreduce(MPI_IN_PLACE, &bendPotential, 1, MPI_REALTYPE, 
+                  MPI_SUM, MPI_COMM_WORLD);
+    MPI_Allreduce(MPI_IN_PLACE, &torsionPotential, 1, 
+                  MPI_REALTYPE, MPI_SUM, MPI_COMM_WORLD);
+    MPI_Allreduce(MPI_IN_PLACE, &inversionPotential, 1, 
+                  MPI_REALTYPE, MPI_SUM, MPI_COMM_WORLD);
+    // MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &bondPotential, 1, MPI::REALTYPE, 
+    //                           MPI::SUM);
+    // MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &bendPotential, 1, MPI::REALTYPE, 
+    //                           MPI::SUM);
+    // MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &torsionPotential, 1, 
+    //                           MPI::REALTYPE, MPI::SUM);
+    // MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &inversionPotential, 1, 
+    //                           MPI::REALTYPE, MPI::SUM);
 #endif
 
     Snapshot* curSnapshot = info_->getSnapshotManager()->getCurrentSnapshot();
@@ -977,8 +986,10 @@ namespace OpenMD {
     }
     
 #ifdef IS_MPI
-    MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, stressTensor.getArrayPointer(), 9, 
-                              MPI::REALTYPE, MPI::SUM);
+    MPI_Allreduce(MPI_IN_PLACE, stressTensor.getArrayPointer(), 9, 
+      MPI_REALTYPE, MPI_SUM, MPI_COMM_WORLD);
+    // MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, stressTensor.getArrayPointer(), 9, 
+    //                           MPI::REALTYPE, MPI::SUM);
 #endif
     curSnapshot->setStressTensor(stressTensor);