--- trunk/OOPSE/libBASS/mpiBASS.c 2004/01/19 16:08:21 957 +++ trunk/OOPSE/libBASS/mpiBASS.c 2004/01/27 19:37:48 988 @@ -86,6 +86,11 @@ 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 @@ -115,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: @@ -186,17 +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" " 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, - ZCONSTRAINT, RIGIDBODY, BLOCK_END ); + POSITION, ASSIGNMENT, MEMBERS, CONSTRAINT, ORIENTATION, + ZCONSTRAINT, RIGIDBODY, MEMBER, BLOCK_END ); #endif MPI_Bcast(&mpiContinue,1,MPI_INT,0,MPI_COMM_WORLD); @@ -253,6 +259,11 @@ void mpiCatchEvent(void) 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; @@ -283,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: