--- trunk/OOPSE/libBASS/mpiBASS.c 2003/03/21 17:42:12 378 +++ trunk/OOPSE/libBASS/mpiBASS.c 2003/08/11 19:38:44 675 @@ -47,7 +47,6 @@ void throwMPIEvent(event* the_event) { mBEvent mpiEventContainer; int mpiStatus; - int mpiError; if (the_event == NULL) mpiStatus = MPI_INTERFACE_DONE; @@ -82,6 +81,11 @@ void throwMPIEvent(event* the_event) 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 @@ -164,7 +168,6 @@ void mpiEventLoop(void) // Everybody but node 0 runs this void mpiEventLoop(void) { - int mpiError; int mpiContinue; #ifdef MPIBASS_VERBOSE @@ -181,13 +184,13 @@ void mpiEventLoop(void) " MEMBER %d\n" " CONSTRAINT %d\n" " ORIENTATION %d\n" - " START_INDEX %d\n" + " ZCONSTRAINT %d\n" " BLOCK_END %d\n" "\n", worldRank, MOLECULE, ATOM, BOND, BEND, TORSION, COMPONENT, POSITION, ASSIGNMENT, MEMBER, CONSTRAINT, ORIENTATION, - START_INDEX, BLOCK_END ); + ZCONSTRAINT, BLOCK_END ); #endif MPI_Bcast(&mpiContinue,1,MPI_INT,0,MPI_COMM_WORLD); @@ -209,9 +212,7 @@ void mpiCatchEvent(void) { event the_event; mBEvent mpiEventContainer; - int mpiError; - MPI_Bcast(&mpiEventContainer,1,mpiBASSEventType,0,MPI_COMM_WORLD); @@ -240,6 +241,11 @@ void mpiCatchEvent(void) the_event.event_type = TORSION; 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; @@ -344,7 +350,6 @@ void mpiInterfaceExit(void){ void mpiInterfaceExit(void){ - int mpiError; int mpiStatus = MPI_INTERFACE_ABORT; MPI_Bcast(&mpiStatus,1,MPI_INT,0,MPI_COMM_WORLD);