--- trunk/OOPSE/libmdtools/SimSetup.cpp	2004/05/27 18:59:17	1203
+++ trunk/OOPSE/libmdtools/SimSetup.cpp	2004/05/27 19:26:42	1204
@@ -1500,8 +1500,10 @@ void SimSetup::mpiMolDivide(void){
   int i, j, k;
   int localMol, allMol;
   int local_atoms, local_bonds, local_bends, local_torsions, local_SRI;
-  int local_rigid;
+  int local_rigid, local_groups;
   vector<int> globalMolIndex;
+  int ncutgroups, atomsingroups, ngroupsinstamp;
+  CutoffGroupStamp* cg;
 
   mpiSim = new mpiSimulation(info);
 
@@ -1521,6 +1523,7 @@ void SimSetup::mpiMolDivide(void){
   local_bends = 0;
   local_torsions = 0;
   local_rigid = 0;
+  local_groups = 0;
   globalAtomCounter = 0;
 
   for (i = 0; i < n_components; i++){
@@ -1531,6 +1534,17 @@ void SimSetup::mpiMolDivide(void){
         local_bends += comp_stamps[i]->getNBends();
         local_torsions += comp_stamps[i]->getNTorsions();
         local_rigid += comp_stamps[i]->getNRigidBodies();
+
+        ncutgroups = comp_stamps[i]->getNCutoffGroups();
+        atomsingroups = 0;
+        for (k=0; k < ncutgroups; k++) {
+          cg = comp_stamps[i]->getCutoffGroup(k);
+          atomsingroups += cg->getNMembers();
+        }
+        ngroupsinstamp = comp_stamps[i]->getNAtoms() - atomsingroups + 
+          ncutgroups;
+        local_groups += ngroupsinstamp;    
+
         localMol++;
       }      
       for (k = 0; k < comp_stamps[i]->getNAtoms(); k++){
@@ -1545,7 +1559,6 @@ void SimSetup::mpiMolDivide(void){
 
   info[0].n_atoms = mpiSim->getNAtomsLocal();  
   
-
   if (local_atoms != info[0].n_atoms){
     sprintf(painCave.errMsg,
             "SimSetup error: mpiSim's localAtom (%d) and SimSetup's\n"
@@ -1555,6 +1568,16 @@ void SimSetup::mpiMolDivide(void){
     simError();
   }
 
+  info[0].ngroup = mpiSim->getNGroupsLocal();   
+  if (local_groups != info[0].ngroup){
+    sprintf(painCave.errMsg,
+            "SimSetup error: mpiSim's localGroups (%d) and SimSetup's\n"
+            "\tlocalGroups (%d) are not equal.\n",
+            info[0].ngroup, local_groups);
+    painCave.isFatal = 1;
+    simError();
+  }
+  
   info[0].n_bonds = local_bonds;
   info[0].n_bends = local_bends;
   info[0].n_torsions = local_torsions;