--- trunk/src/brains/SimCreator.cpp	2012/08/31 21:16:10	1793
+++ trunk/src/brains/SimCreator.cpp	2012/09/10 18:38:44	1796
@@ -506,7 +506,7 @@ namespace OpenMD {
     int nGlobalMols = info->getNGlobalMolecules();
     std::vector<int> molToProcMap(nGlobalMols, -1); // default to an error condition:
     
-    MPI_Comm_size(MPI_COMM_WORLD, &nProcessors);
+    nProcessors = MPI::COMM_WORLD.Get_size();
     
     if (nProcessors > nGlobalMols) {
       sprintf(painCave.errMsg,
@@ -621,13 +621,11 @@ namespace OpenMD {
       delete myRandom;
       
       // Spray out this nonsense to all other processors:
-      
-      MPI_Bcast(&molToProcMap[0], nGlobalMols, MPI_INT, 0, MPI_COMM_WORLD);
+      MPI::COMM_WORLD.Bcast(&molToProcMap[0], nGlobalMols, MPI::INT, 0);
     } else {
       
       // Listen to your marching orders from processor 0:
-      
-      MPI_Bcast(&molToProcMap[0], nGlobalMols, MPI_INT, 0, MPI_COMM_WORLD);
+      MPI::COMM_WORLD.Bcast(&molToProcMap[0], nGlobalMols, MPI::INT, 0);
     }
     
     info->setMolToProcMap(molToProcMap);
@@ -851,8 +849,9 @@ namespace OpenMD {
     // This would be prettier if we could use MPI_IN_PLACE like the MPI-2
     // docs said we could.
     std::vector<int> tmpGroupMembership(info->getNGlobalAtoms(), 0);
-    MPI_Allreduce(&globalGroupMembership[0], &tmpGroupMembership[0], nGlobalAtoms,
-                  MPI_INT, MPI_SUM, MPI_COMM_WORLD);
+    MPI::COMM_WORLD.Allreduce(&globalGroupMembership[0], 
+                              &tmpGroupMembership[0], nGlobalAtoms,
+                              MPI::INT, MPI::SUM);
     info->setGlobalGroupMembership(tmpGroupMembership);
 #else
     info->setGlobalGroupMembership(globalGroupMembership);
@@ -869,10 +868,10 @@ namespace OpenMD {
     
 #ifdef IS_MPI
     std::vector<int> tmpMolMembership(info->getNGlobalAtoms(), 0);
+    MPI::COMM_WORLD.Allreduce(&globalMolMembership[0], &tmpMolMembership[0], 
+                              nGlobalAtoms,
+                              MPI::INT, MPI::SUM);
     
-    MPI_Allreduce(&globalMolMembership[0], &tmpMolMembership[0], nGlobalAtoms,
-                  MPI_INT, MPI_SUM, MPI_COMM_WORLD);
-    
     info->setGlobalMolMembership(tmpMolMembership);
 #else
     info->setGlobalMolMembership(globalMolMembership);
@@ -888,8 +887,8 @@ namespace OpenMD {
     
 #ifdef IS_MPI
     std::vector<int> numIntegrableObjectsPerMol(info->getNGlobalMolecules(), 0);
-    MPI_Allreduce(&nIOPerMol[0], &numIntegrableObjectsPerMol[0], 
-                  info->getNGlobalMolecules(), MPI_INT, MPI_SUM, MPI_COMM_WORLD);
+    MPI::COMM_WORLD.Allreduce(&nIOPerMol[0], &numIntegrableObjectsPerMol[0], 
+                              info->getNGlobalMolecules(), MPI::INT, MPI::SUM);
 #else
     std::vector<int> numIntegrableObjectsPerMol = nIOPerMol;
 #endif