ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE/libBASS/mpiBASS.c
(Generate patch)

Comparing trunk/OOPSE/libBASS/mpiBASS.c (file contents):
Revision 378 by mmeineke, Fri Mar 21 17:42:12 2003 UTC vs.
Revision 988 by gezelter, Tue Jan 27 19:37:48 2004 UTC

# Line 47 | Line 47 | void throwMPIEvent(event* the_event)
47   {
48    mBEvent mpiEventContainer;
49    int mpiStatus;
50 –  int mpiError;
50  
51  
52    if (the_event == NULL)     mpiStatus = MPI_INTERFACE_DONE;
# Line 62 | Line 61 | void throwMPIEvent(event* the_event)
61        mpiEventContainer.i1 = the_event->evt.blk_index; // pack block index into first int  
62      break;
63  
64 +    case RIGIDBODY:
65 +      mpiEventContainer.type = mpiRIGIDBODY;
66 +      mpiEventContainer.i1 = the_event->evt.blk_index; // pack block index into first int  
67 +    break;
68 +
69      case ATOM:
70        mpiEventContainer.type = mpiATOM;
71        mpiEventContainer.i1 = the_event->evt.blk_index; // pack block index into first int
# Line 82 | Line 86 | void throwMPIEvent(event* the_event)
86        mpiEventContainer.i1 = the_event->evt.blk_index; // pack block index into first int
87        break;
88  
89 +    case MEMBER:
90 +      mpiEventContainer.type = mpiMEMBER;
91 +      mpiEventContainer.i1 = the_event->evt.blk_index; // pack block index into first int
92 +      break;
93 +
94 +    case ZCONSTRAINT:
95 +      mpiEventContainer.type = mpiZCONSTRAINT;
96 +      mpiEventContainer.i1 = the_event->evt.blk_index; // pack block index into first int
97 +      break;
98 +
99      case COMPONENT:
100        mpiEventContainer.type = mpiCOMPONENT;
101        mpiEventContainer.i1 = the_event->evt.blk_index; // pack block index into first int
# Line 106 | Line 120 | void throwMPIEvent(event* the_event)
120        mpiEventContainer.d1 = the_event->evt.cnstr; // pack constraint coord into d
121        break;
122        
123 <    case MEMBER:
124 <      mpiEventContainer.type = mpiMEMBER;
125 <      mpiEventContainer.i1 = the_event->evt.mbr.a ; // pack member ints into i
126 <      mpiEventContainer.i2 = the_event->evt.mbr.b;
127 <      mpiEventContainer.i3 = the_event->evt.mbr.c;  
128 <      mpiEventContainer.i4 = the_event->evt.mbr.d;  
123 >    case MEMBERS:
124 >      mpiEventContainer.type = mpiMEMBERS;
125 >      mpiEventContainer.i1 = the_event->evt.mbrs.a ; // pack member ints into i
126 >      mpiEventContainer.i2 = the_event->evt.mbrs.b;
127 >      mpiEventContainer.i3 = the_event->evt.mbrs.c;  
128 >      mpiEventContainer.i4 = the_event->evt.mbrs.d;  
129        break;
130        
131      case ASSIGNMENT:
# Line 164 | Line 178 | void mpiEventLoop(void)
178   // Everybody but node 0 runs this
179   void mpiEventLoop(void)
180   {
167 –  int mpiError;
181    int mpiContinue;
182  
183   #ifdef MPIBASS_VERBOSE
# Line 178 | Line 191 | void mpiEventLoop(void)
191            "  COMPONENT   %d\n"
192            "  POSITION    %d\n"
193            "  ASSIGNMENT  %d\n"
194 <          "  MEMBER      %d\n"
194 >          "  MEMBERS     %d\n"
195            "  CONSTRAINT  %d\n"
196            "  ORIENTATION %d\n"
197 <          "  START_INDEX %d\n"
197 >          "  ZCONSTRAINT %d\n"
198 >          "  RIGIDBODY   %d\n"
199 >          "  MEMBER      %d\n"
200            "  BLOCK_END   %d\n"
201            "\n",
202            worldRank,
203            MOLECULE, ATOM, BOND, BEND, TORSION, COMPONENT,
204 <          POSITION, ASSIGNMENT, MEMBER, CONSTRAINT, ORIENTATION,
205 <          START_INDEX, BLOCK_END );
204 >          POSITION, ASSIGNMENT, MEMBERS, CONSTRAINT, ORIENTATION,
205 >          ZCONSTRAINT, RIGIDBODY, MEMBER, BLOCK_END );
206   #endif
207  
208    MPI_Bcast(&mpiContinue,1,MPI_INT,0,MPI_COMM_WORLD);
# Line 209 | Line 224 | void mpiCatchEvent(void)
224   {
225    event the_event;
226    mBEvent mpiEventContainer;
212 –  int mpiError;
227  
214 –
228    
229    MPI_Bcast(&mpiEventContainer,1,mpiBASSEventType,0,MPI_COMM_WORLD);
230  
# Line 220 | Line 233 | void mpiCatchEvent(void)
233      the_event.event_type = MOLECULE;
234      the_event.evt.blk_index = mpiEventContainer.i1;
235      break;
236 +
237 +  case mpiRIGIDBODY:
238 +    the_event.event_type = RIGIDBODY;
239 +    the_event.evt.blk_index = mpiEventContainer.i1;
240 +    break;
241      
242    case mpiATOM:
243      the_event.event_type = ATOM;
# Line 240 | Line 258 | void mpiCatchEvent(void)
258      the_event.event_type = TORSION;
259      the_event.evt.blk_index = mpiEventContainer.i1;
260      break;
261 +
262 +  case mpiMEMBER:
263 +    the_event.event_type = MEMBER;
264 +    the_event.evt.blk_index = mpiEventContainer.i1;
265 +    break;
266 +
267 +  case mpiZCONSTRAINT:
268 +    the_event.event_type = ZCONSTRAINT;
269 +    the_event.evt.blk_index = mpiEventContainer.i1;
270 +    break;
271      
272    case mpiCOMPONENT:
273      the_event.event_type = COMPONENT;
# Line 266 | Line 294 | void mpiCatchEvent(void)
294      the_event.evt.cnstr = mpiEventContainer.d1;
295      break;
296      
297 <  case mpiMEMBER:
298 <    the_event.event_type = MEMBER;
299 <    the_event.evt.mbr.a = mpiEventContainer.i1;
300 <    the_event.evt.mbr.b = mpiEventContainer.i2;
301 <    the_event.evt.mbr.c = mpiEventContainer.i3;  
302 <    the_event.evt.mbr.d = mpiEventContainer.i4;  
297 >  case mpiMEMBERS:
298 >    the_event.event_type = MEMBERS;
299 >    the_event.evt.mbrs.a = mpiEventContainer.i1;
300 >    the_event.evt.mbrs.b = mpiEventContainer.i2;
301 >    the_event.evt.mbrs.c = mpiEventContainer.i3;  
302 >    the_event.evt.mbrs.d = mpiEventContainer.i4;  
303      break;
304      
305    case mpiASSIGNMENT_s:
# Line 344 | Line 372 | void mpiInterfaceExit(void){
372  
373  
374   void mpiInterfaceExit(void){
347 –  int mpiError;
375    int mpiStatus = MPI_INTERFACE_ABORT;
376    
377    MPI_Bcast(&mpiStatus,1,MPI_INT,0,MPI_COMM_WORLD);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines