--- trunk/OOPSE/libBASS/mpiBASS.c	2003/03/21 17:42:12	378
+++ trunk/OOPSE/libBASS/mpiBASS.c	2004/01/27 19:37:48	988
@@ -47,7 +47,6 @@ void throwMPIEvent(event* the_event)
 {
   mBEvent mpiEventContainer;
   int mpiStatus;
-  int mpiError;
 
 
   if (the_event == NULL)     mpiStatus = MPI_INTERFACE_DONE;
@@ -62,6 +61,11 @@ void throwMPIEvent(event* the_event)
       mpiEventContainer.i1 = the_event->evt.blk_index; // pack block index into first int  
     break;
 
+    case RIGIDBODY:
+      mpiEventContainer.type = mpiRIGIDBODY;
+      mpiEventContainer.i1 = the_event->evt.blk_index; // pack block index into first int  
+    break;
+
     case ATOM:
       mpiEventContainer.type = mpiATOM;
       mpiEventContainer.i1 = the_event->evt.blk_index; // pack block index into first int
@@ -82,6 +86,16 @@ void throwMPIEvent(event* the_event)
       mpiEventContainer.i1 = the_event->evt.blk_index; // pack block index into first int
       break;
 
+    case MEMBER:
+      mpiEventContainer.type = mpiMEMBER;
+      mpiEventContainer.i1 = the_event->evt.blk_index; // pack block index into first int
+      break;
+
+    case ZCONSTRAINT:
+      mpiEventContainer.type = mpiZCONSTRAINT;
+      mpiEventContainer.i1 = the_event->evt.blk_index; // pack block index into first int
+      break;
+
     case COMPONENT:
       mpiEventContainer.type = mpiCOMPONENT;
       mpiEventContainer.i1 = the_event->evt.blk_index; // pack block index into first int
@@ -106,12 +120,12 @@ void throwMPIEvent(event* the_event)
       mpiEventContainer.d1 = the_event->evt.cnstr; // pack constraint coord into d
       break;
       
-    case MEMBER:
-      mpiEventContainer.type = mpiMEMBER;
-      mpiEventContainer.i1 = the_event->evt.mbr.a ; // pack member ints into i
-      mpiEventContainer.i2 = the_event->evt.mbr.b; 
-      mpiEventContainer.i3 = the_event->evt.mbr.c;   
-      mpiEventContainer.i4 = the_event->evt.mbr.d;   
+    case MEMBERS:
+      mpiEventContainer.type = mpiMEMBERS;
+      mpiEventContainer.i1 = the_event->evt.mbrs.a ; // pack member ints into i
+      mpiEventContainer.i2 = the_event->evt.mbrs.b; 
+      mpiEventContainer.i3 = the_event->evt.mbrs.c;   
+      mpiEventContainer.i4 = the_event->evt.mbrs.d;   
       break;
       
     case ASSIGNMENT:
@@ -164,7 +178,6 @@ void mpiEventLoop(void)
 // Everybody but node 0 runs this
 void mpiEventLoop(void)
 {
-  int mpiError;
   int mpiContinue;
 
 #ifdef MPIBASS_VERBOSE
@@ -178,16 +191,18 @@ void mpiEventLoop(void)
 	  "  COMPONENT   %d\n"
 	  "  POSITION    %d\n"
 	  "  ASSIGNMENT  %d\n"
-	  "  MEMBER      %d\n"
+	  "  MEMBERS     %d\n"
 	  "  CONSTRAINT  %d\n"
 	  "  ORIENTATION %d\n"
-	  "  START_INDEX %d\n"
+	  "  ZCONSTRAINT %d\n"
+	  "  RIGIDBODY   %d\n"
+	  "  MEMBER      %d\n"
 	  "  BLOCK_END   %d\n"
 	  "\n",
 	  worldRank,
 	  MOLECULE, ATOM, BOND, BEND, TORSION, COMPONENT, 
-	  POSITION, ASSIGNMENT, MEMBER, CONSTRAINT, ORIENTATION,
-	  START_INDEX, BLOCK_END );
+	  POSITION, ASSIGNMENT, MEMBERS, CONSTRAINT, ORIENTATION,
+	  ZCONSTRAINT, RIGIDBODY, MEMBER, BLOCK_END );
 #endif
 
   MPI_Bcast(&mpiContinue,1,MPI_INT,0,MPI_COMM_WORLD);
@@ -209,9 +224,7 @@ void mpiCatchEvent(void)
 {
   event the_event;
   mBEvent mpiEventContainer;
-  int mpiError;
 
-
   
   MPI_Bcast(&mpiEventContainer,1,mpiBASSEventType,0,MPI_COMM_WORLD);
 
@@ -220,6 +233,11 @@ void mpiCatchEvent(void)
     the_event.event_type = MOLECULE;
     the_event.evt.blk_index = mpiEventContainer.i1;
     break;
+
+  case mpiRIGIDBODY:
+    the_event.event_type = RIGIDBODY;
+    the_event.evt.blk_index = mpiEventContainer.i1;
+    break;
     
   case mpiATOM:
     the_event.event_type = ATOM;
@@ -240,6 +258,16 @@ void mpiCatchEvent(void)
     the_event.event_type = TORSION;
     the_event.evt.blk_index = mpiEventContainer.i1;
     break;
+
+  case mpiMEMBER:
+    the_event.event_type = MEMBER;
+    the_event.evt.blk_index = mpiEventContainer.i1;
+    break;
+
+  case mpiZCONSTRAINT:
+    the_event.event_type = ZCONSTRAINT;
+    the_event.evt.blk_index = mpiEventContainer.i1;
+    break;
     
   case mpiCOMPONENT:
     the_event.event_type = COMPONENT;
@@ -266,12 +294,12 @@ void mpiCatchEvent(void)
     the_event.evt.cnstr = mpiEventContainer.d1; 
     break;
     
-  case mpiMEMBER:
-    the_event.event_type = MEMBER;
-    the_event.evt.mbr.a = mpiEventContainer.i1; 
-    the_event.evt.mbr.b = mpiEventContainer.i2; 
-    the_event.evt.mbr.c = mpiEventContainer.i3;   
-    the_event.evt.mbr.d = mpiEventContainer.i4;   
+  case mpiMEMBERS:
+    the_event.event_type = MEMBERS;
+    the_event.evt.mbrs.a = mpiEventContainer.i1; 
+    the_event.evt.mbrs.b = mpiEventContainer.i2; 
+    the_event.evt.mbrs.c = mpiEventContainer.i3;   
+    the_event.evt.mbrs.d = mpiEventContainer.i4;   
     break;
     
   case mpiASSIGNMENT_s:
@@ -344,7 +372,6 @@ void mpiInterfaceExit(void){
 
 
 void mpiInterfaceExit(void){
-  int mpiError;
   int mpiStatus = MPI_INTERFACE_ABORT;
   
   MPI_Bcast(&mpiStatus,1,MPI_INT,0,MPI_COMM_WORLD);