# | Line 1 | Line 1 | |
---|---|---|
1 | < | /* |
1 | > | /* |
2 | * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved. | |
3 | * | |
4 | * The University of Notre Dame grants you ("Licensee") a | |
# | Line 99 | Line 99 | void throwMPIEvent(event* the_event) | |
99 | switch (the_event->event_type){ | |
100 | case MOLECULE: | |
101 | mpiEventContainer.type = mpiMOLECULE; | |
102 | < | mpiEventContainer.i1 = the_event->evt.blk_index; // pack block index into first int |
103 | < | break; |
102 | > | mpiEventContainer.i1 = the_event->evt.blk_index; /* pack block index into first int */ |
103 | > | break; |
104 | ||
105 | case RIGIDBODY: | |
106 | mpiEventContainer.type = mpiRIGIDBODY; | |
107 | < | mpiEventContainer.i1 = the_event->evt.blk_index; // pack block index into first int |
108 | < | break; |
107 | > | mpiEventContainer.i1 = the_event->evt.blk_index; /* pack block index into first int */ |
108 | > | break; |
109 | ||
110 | case CUTOFFGROUP: | |
111 | mpiEventContainer.type = mpiCUTOFFGROUP; | |
112 | < | mpiEventContainer.i1 = the_event->evt.blk_index; // pack block index into first int |
113 | < | break; |
112 | > | mpiEventContainer.i1 = the_event->evt.blk_index; /* pack block index into first int */ |
113 | > | break; |
114 | ||
115 | case ATOM: | |
116 | mpiEventContainer.type = mpiATOM; | |
117 | < | mpiEventContainer.i1 = the_event->evt.blk_index; // pack block index into first int |
117 | > | mpiEventContainer.i1 = the_event->evt.blk_index; /* pack block index into first int*/ |
118 | break; | |
119 | ||
120 | case BOND: | |
121 | mpiEventContainer.type = mpiBOND; | |
122 | < | mpiEventContainer.i1 = the_event->evt.blk_index; // pack block index into first int |
122 | > | mpiEventContainer.i1 = the_event->evt.blk_index; /* pack block index into first int*/ |
123 | break; | |
124 | ||
125 | case BEND: | |
126 | mpiEventContainer.type = mpiBEND; | |
127 | < | mpiEventContainer.i1 = the_event->evt.blk_index; // pack block index into first int |
127 | > | mpiEventContainer.i1 = the_event->evt.blk_index; /* pack block index into first int*/ |
128 | break; | |
129 | ||
130 | case TORSION: | |
131 | mpiEventContainer.type = mpiTORSION; | |
132 | < | mpiEventContainer.i1 = the_event->evt.blk_index; // pack block index into first int |
132 | > | mpiEventContainer.i1 = the_event->evt.blk_index; /* pack block index into first int*/ |
133 | break; | |
134 | ||
135 | case ZCONSTRAINT: | |
136 | mpiEventContainer.type = mpiZCONSTRAINT; | |
137 | < | mpiEventContainer.i1 = the_event->evt.blk_index; // pack block index into first int |
137 | > | mpiEventContainer.i1 = the_event->evt.blk_index; /* pack block index into first int*/ |
138 | break; | |
139 | ||
140 | case COMPONENT: | |
141 | mpiEventContainer.type = mpiCOMPONENT; | |
142 | < | mpiEventContainer.i1 = the_event->evt.blk_index; // pack block index into first int |
142 | > | mpiEventContainer.i1 = the_event->evt.blk_index; /* pack block index into first int*/ |
143 | break; | |
144 | ||
145 | case POSITION: | |
146 | mpiEventContainer.type = mpiPOSITION; | |
147 | < | mpiEventContainer.d1 = the_event->evt.pos.x; // pack pos coord into d |
147 | > | mpiEventContainer.d1 = the_event->evt.pos.x; /* pack pos coord into d*/ |
148 | mpiEventContainer.d2 = the_event->evt.pos.y; | |
149 | mpiEventContainer.d3 = the_event->evt.pos.z; | |
150 | break; | |
151 | ||
152 | case ORIENTATION: | |
153 | mpiEventContainer.type = mpiORIENTATION; | |
154 | < | mpiEventContainer.d1 = the_event->evt.ornt.phi; // pack orientation coord into d |
154 | > | mpiEventContainer.d1 = the_event->evt.ornt.phi; /* pack orientation coord into d*/ |
155 | mpiEventContainer.d2 = the_event->evt.ornt.theta; | |
156 | mpiEventContainer.d3 = the_event->evt.ornt.psi; | |
157 | break; | |
158 | ||
159 | case CONSTRAINT: | |
160 | mpiEventContainer.type = mpiCONSTRAINT; | |
161 | < | mpiEventContainer.d1 = the_event->evt.cnstr; // pack constraint coord into d |
161 | > | mpiEventContainer.d1 = the_event->evt.cnstr; /* pack constraint coord into d*/ |
162 | break; | |
163 | ||
164 | case MEMBERS: | |
165 | mpiEventContainer.type = mpiMEMBERS; | |
166 | < | mpiEventContainer.i1 = the_event->evt.mbrs.nMembers ; // pack member ints into i |
166 | > | mpiEventContainer.i1 = the_event->evt.mbrs.nMembers ; /* pack member ints into i*/ |
167 | break; | |
168 | ||
169 | case ASSIGNMENT: | |
# | Line 208 | Line 208 | void throwMPIEvent(event* the_event) | |
208 | ||
209 | if (the_event->event_type == MEMBERS) { | |
210 | ||
211 | < | // For member lists, we need a separate broadcast to spew out the |
212 | < | // membership array: |
211 | > | /* For member lists, we need a separate broadcast to spew out the*/ |
212 | > | /* membership array:*/ |
213 | MPI_Bcast(the_event->evt.mbrs.memberList, the_event->evt.mbrs.nMembers, | |
214 | MPI_INT, 0, MPI_COMM_WORLD); | |
215 | ||
# | Line 223 | Line 223 | void throwMPIEvent(event* the_event) | |
223 | } | |
224 | ||
225 | ||
226 | < | // Everybody but node 0 runs this |
226 | > | /* Everybody but node 0 runs this*/ |
227 | void mpiEventLoop(void) | |
228 | { | |
229 | int mpiContinue; | |
# | Line 347 | Line 347 | void mpiCatchEvent(void) | |
347 | the_event.evt.mbrs.nMembers = mpiEventContainer.i1; | |
348 | ||
349 | the_event.evt.mbrs.memberList = (int *) calloc(the_event.evt.mbrs.nMembers, | |
350 | < | sizeof(int)); |
350 | > | sizeof(int)); |
351 | ||
352 | < | // Grab the member list since we have a number of members: |
352 | > | /* Grab the member list since we have a number of members:*/ |
353 | MPI_Bcast(the_event.evt.mbrs.memberList, the_event.evt.mbrs.nMembers, | |
354 | MPI_INT, 0, MPI_COMM_WORLD); | |
355 |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |