# | Line 1 | Line 1 | |
---|---|---|
1 | + | #define _LARGEFILE_SOURCE64 |
2 | #define _FILE_OFFSET_BITS 64 | |
3 | ||
4 | #include <string.h> | |
# | Line 87 | Line 88 | void DumpWriter::sortByGlobalIndex(){ | |
88 | */ | |
89 | ||
90 | void DumpWriter::sortByGlobalIndex(){ | |
91 | < | Atom** atoms = entry_plug->atoms; |
91 | < | |
91 | > | Molecule* mols = entry_plug->molecules; |
92 | indexArray.clear(); | |
93 | ||
94 | < | for(int i = 0; i < mpiSim->getMyNlocal();i++) |
95 | < | indexArray.push_back(make_pair(i, atoms[i]->getGlobalIndex())); |
94 | > | for(int i = 0; i < entry_plug->n_mol;i++) |
95 | > | indexArray.push_back(make_pair(i, mols[i].getGlobalIndex())); |
96 | ||
97 | sort(indexArray.begin(), indexArray.end(), indexSortingCriterion); | |
98 | – | |
99 | – | //for (int i = 0; i < mpiSim->getMyNlocal(); i++) { |
100 | – | // printf("node %d has global %d at local %d\n", worldRank, indexArray[i].second, indexArray[i].first); |
101 | – | //} |
102 | – | |
98 | } | |
99 | ||
100 | #endif | |
# | Line 110 | Line 105 | void DumpWriter::writeDump(double currentTime){ | |
105 | vector<ofstream*> fileStreams; | |
106 | ||
107 | #ifdef IS_MPI | |
113 | – | printf("Hello from node %d\n", worldRank); |
114 | – | sortByGlobalIndex(); |
108 | if(worldRank == 0 ){ | |
109 | < | |
109 | > | #endif |
110 | finalOut.open( entry_plug->finalName, ios::out | ios::trunc ); | |
111 | if( !finalOut ){ | |
112 | sprintf( painCave.errMsg, | |
# | Line 122 | Line 115 | void DumpWriter::writeDump(double currentTime){ | |
115 | painCave.isFatal = 1; | |
116 | simError(); | |
117 | } | |
118 | + | #ifdef IS_MPI |
119 | } | |
120 | #endif // is_mpi | |
121 | ||
# | Line 143 | Line 137 | void DumpWriter::writeFinal(double currentTime){ | |
137 | ||
138 | #ifdef IS_MPI | |
139 | if(worldRank == 0 ){ | |
140 | + | #endif // is_mpi |
141 | ||
142 | finalOut.open( entry_plug->finalName, ios::out | ios::trunc ); | |
143 | ||
# | Line 154 | Line 149 | void DumpWriter::writeFinal(double currentTime){ | |
149 | simError(); | |
150 | } | |
151 | ||
152 | + | #ifdef IS_MPI |
153 | } | |
154 | #endif // is_mpi | |
155 | ||
# | Line 220 | Line 216 | void DumpWriter::writeFrame( vector<ofstream*>& outFil | |
216 | ||
217 | int nProc; | |
218 | int j, which_node, done, which_atom, local_index, currentIndex; | |
219 | < | double atomData6[6]; |
224 | < | double atomData13[13]; |
219 | > | double atomData[13]; |
220 | int isDirectional; | |
221 | char* atomTypeString; | |
222 | char MPIatomTypeString[MINIBUFFERSIZE]; | |
223 | < | |
224 | < | #else //is_mpi |
230 | < | int nAtoms = entry_plug->n_atoms; |
223 | > | int nObjects; |
224 | > | int msgLen; // the length of message actually recieved at master nodes |
225 | #endif //is_mpi | |
226 | ||
227 | < | double q[4]; |
227 | > | double q[4], ji[3]; |
228 | DirectionalAtom* dAtom; | |
235 | – | Atom** atoms = entry_plug->atoms; |
229 | double pos[3], vel[3]; | |
230 | < | |
230 | > | int nTotObjects; |
231 | > | StuntDouble* sd; |
232 | > | char* molName; |
233 | > | vector<StuntDouble*> integrableObjects; |
234 | > | vector<StuntDouble*>::iterator iter; |
235 | > | nTotObjects = entry_plug->getTotIntegrableObjects(); |
236 | #ifndef IS_MPI | |
237 | ||
238 | for(k = 0; k < outFile.size(); k++){ | |
239 | < | *outFile[k] << nAtoms << "\n"; |
239 | > | *outFile[k] << nTotObjects << "\n"; |
240 | ||
241 | *outFile[k] << currentTime << ";\t" | |
242 | << entry_plug->Hmat[0][0] << "\t" | |
# | Line 257 | Line 255 | void DumpWriter::writeFrame( vector<ofstream*>& outFil | |
255 | *outFile[k] << entry_plug->the_integrator->getAdditionalParameters() << endl; | |
256 | } | |
257 | ||
258 | < | for( i=0; i<nAtoms; i++ ){ |
258 | > | for( i=0; i< entry_plug->n_mol; i++ ){ |
259 | ||
260 | < | atoms[i]->getPos(pos); |
261 | < | atoms[i]->getVel(vel); |
260 | > | integrableObjects = entry_plug->molecules[i].getIntegrableObjects(); |
261 | > | molName = (entry_plug->compStamps[entry_plug->molecules[i].getStampID()])->getID(); |
262 | > | |
263 | > | for( iter = integrableObjects.begin();iter != integrableObjects.end(); ++iter){ |
264 | > | sd = *iter; |
265 | > | sd->getPos(pos); |
266 | > | sd->getVel(vel); |
267 | ||
265 | – | sprintf( tempBuffer, |
266 | – | "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t", |
267 | – | atoms[i]->getType(), |
268 | – | pos[0], |
269 | – | pos[1], |
270 | – | pos[2], |
271 | – | vel[0], |
272 | – | vel[1], |
273 | – | vel[2]); |
274 | – | strcpy( writeLine, tempBuffer ); |
275 | – | |
276 | – | if( atoms[i]->isDirectional() ){ |
277 | – | |
278 | – | dAtom = (DirectionalAtom *)atoms[i]; |
279 | – | dAtom->getQ( q ); |
280 | – | |
268 | sprintf( tempBuffer, | |
269 | < | "%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\n", |
270 | < | q[0], |
271 | < | q[1], |
272 | < | q[2], |
273 | < | q[3], |
274 | < | dAtom->getJx(), |
275 | < | dAtom->getJy(), |
276 | < | dAtom->getJz()); |
277 | < | strcat( writeLine, tempBuffer ); |
269 | > | "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t", |
270 | > | sd->getType(), |
271 | > | pos[0], |
272 | > | pos[1], |
273 | > | pos[2], |
274 | > | vel[0], |
275 | > | vel[1], |
276 | > | vel[2]); |
277 | > | strcpy( writeLine, tempBuffer ); |
278 | > | |
279 | > | if( sd->isDirectional() ){ |
280 | > | |
281 | > | sd->getQ( q ); |
282 | > | sd->getJ( ji ); |
283 | > | |
284 | > | sprintf( tempBuffer, |
285 | > | "%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\n", |
286 | > | q[0], |
287 | > | q[1], |
288 | > | q[2], |
289 | > | q[3], |
290 | > | ji[0], |
291 | > | ji[1], |
292 | > | ji[2]); |
293 | > | strcat( writeLine, tempBuffer ); |
294 | > | } |
295 | > | else |
296 | > | strcat( writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n" ); |
297 | } | |
292 | – | else |
293 | – | strcat( writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n" ); |
298 | ||
299 | + | |
300 | for(k = 0; k < outFile.size(); k++) | |
301 | *outFile[k] << writeLine; | |
302 | < | } |
302 | > | } |
303 | ||
304 | #else // is_mpi | |
305 | ||
# | Line 311 | Line 316 | void DumpWriter::writeFrame( vector<ofstream*>& outFil | |
316 | int haveError; | |
317 | ||
318 | MPI_Status istatus; | |
319 | < | int *AtomToProcMap = mpiSim->getAtomToProcMap(); |
319 | > | int nCurObj; |
320 | > | int *MolToProcMap = mpiSim->getMolToProcMap(); |
321 | ||
322 | // write out header and node 0's coordinates | |
323 | ||
# | Line 327 | Line 333 | void DumpWriter::writeFrame( vector<ofstream*>& outFil | |
333 | potatoes[i] = 0; | |
334 | ||
335 | for(k = 0; k < outFile.size(); k++){ | |
336 | < | *outFile[k] << mpiSim->getTotAtoms() << "\n"; |
336 | > | *outFile[k] << nTotObjects << "\n"; |
337 | ||
338 | *outFile[k] << currentTime << ";\t" | |
339 | << entry_plug->Hmat[0][0] << "\t" | |
# | Line 347 | Line 353 | void DumpWriter::writeFrame( vector<ofstream*>& outFil | |
353 | ||
354 | currentIndex = 0; | |
355 | ||
356 | < | for (i = 0 ; i < mpiSim->getTotAtoms(); i++ ) { |
356 | > | for (i = 0 ; i < mpiSim->getTotNmol(); i++ ) { |
357 | ||
358 | // Get the Node number which has this atom; | |
359 | ||
360 | < | which_node = AtomToProcMap[i]; |
360 | > | which_node = MolToProcMap[i]; |
361 | ||
362 | if (which_node != 0) { | |
363 | < | |
364 | < | if (potatoes[which_node] + 3 >= MAXTAG) { |
363 | > | |
364 | > | if (potatoes[which_node] + 1 >= MAXTAG) { |
365 | // The potato was going to exceed the maximum value, | |
366 | // so wrap this processor potato back to 0: | |
367 | ||
368 | potatoes[which_node] = 0; | |
369 | < | MPI_Send(0, 1, MPI_INT, which_node, 0, MPI_COMM_WORLD); |
369 | > | MPI_Send(&potatoes[which_node], 1, MPI_INT, which_node, 0, MPI_COMM_WORLD); |
370 | ||
371 | } | |
372 | ||
373 | myPotato = potatoes[which_node]; | |
368 | – | |
369 | – | MPI_Recv(MPIatomTypeString, MINIBUFFERSIZE, MPI_CHAR, which_node, |
370 | – | myPotato, MPI_COMM_WORLD, &istatus); |
371 | – | |
372 | – | atomTypeString = MPIatomTypeString; |
373 | – | |
374 | – | myPotato++; |
374 | ||
375 | < | MPI_Recv(&isDirectional, 1, MPI_INT, which_node, |
375 | > | //recieve the number of integrableObject in current molecule |
376 | > | MPI_Recv(&nCurObj, 1, MPI_INT, which_node, |
377 | myPotato, MPI_COMM_WORLD, &istatus); | |
378 | – | |
378 | myPotato++; | |
379 | + | |
380 | + | for(int l = 0; l < nCurObj; l++){ |
381 | ||
382 | < | if (isDirectional) { |
383 | < | MPI_Recv(atomData13, 13, MPI_DOUBLE, which_node, |
384 | < | myPotato, MPI_COMM_WORLD, &istatus); |
385 | < | } else { |
386 | < | MPI_Recv(atomData6, 6, MPI_DOUBLE, which_node, |
387 | < | myPotato, MPI_COMM_WORLD, &istatus); |
382 | > | if (potatoes[which_node] + 2 >= MAXTAG) { |
383 | > | // The potato was going to exceed the maximum value, |
384 | > | // so wrap this processor potato back to 0: |
385 | > | |
386 | > | potatoes[which_node] = 0; |
387 | > | MPI_Send(&potatoes[which_node], 1, MPI_INT, which_node, 0, MPI_COMM_WORLD); |
388 | > | |
389 | > | } |
390 | > | |
391 | > | MPI_Recv(MPIatomTypeString, MINIBUFFERSIZE, MPI_CHAR, which_node, |
392 | > | myPotato, MPI_COMM_WORLD, &istatus); |
393 | > | |
394 | > | atomTypeString = MPIatomTypeString; |
395 | > | |
396 | > | myPotato++; |
397 | > | |
398 | > | MPI_Recv(atomData, 13, MPI_DOUBLE, which_node, myPotato, MPI_COMM_WORLD, &istatus); |
399 | > | myPotato++; |
400 | > | |
401 | > | MPI_Get_count(&istatus, MPI_DOUBLE, &msgLen); |
402 | > | |
403 | > | if(msgLen == 13) |
404 | > | isDirectional = 1; |
405 | > | else |
406 | > | isDirectional = 0; |
407 | > | |
408 | } | |
388 | – | |
389 | – | myPotato++; |
409 | potatoes[which_node] = myPotato; | |
410 | ||
411 | } else { | |
412 | ||
413 | haveError = 0; | |
395 | – | which_atom = i; |
414 | ||
415 | < | //local_index = -1; |
415 | > | local_index = indexArray[currentIndex].first; |
416 | ||
417 | < | //for (j=0; (j<mpiSim->getMyNlocal()) && (local_index < 0); j++) { |
400 | < | // if (atoms[j]->getGlobalIndex() == which_atom) local_index = j; |
401 | < | //} |
402 | < | |
403 | < | //if (local_index != -1) { |
404 | < | |
405 | < | local_index = indexArray[currentIndex].first; |
406 | < | |
407 | < | if (which_atom == indexArray[currentIndex].second) { |
408 | < | |
409 | < | atomTypeString = atoms[local_index]->getType(); |
410 | < | |
411 | < | atoms[local_index]->getPos(pos); |
412 | < | atoms[local_index]->getVel(vel); |
413 | < | |
414 | < | atomData6[0] = pos[0]; |
415 | < | atomData6[1] = pos[1]; |
416 | < | atomData6[2] = pos[2]; |
417 | > | integrableObjects = (entry_plug->molecules[local_index]).getIntegrableObjects(); |
418 | ||
419 | < | atomData6[3] = vel[0]; |
420 | < | atomData6[4] = vel[1]; |
421 | < | atomData6[5] = vel[2]; |
422 | < | |
423 | < | isDirectional = 0; |
419 | > | for(iter= integrableObjects.begin(); iter != integrableObjects.end(); ++iter){ |
420 | > | sd = *iter; |
421 | > | atomTypeString = sd->getType(); |
422 | > | |
423 | > | sd->getPos(pos); |
424 | > | sd->getVel(vel); |
425 | > | |
426 | > | atomData[0] = pos[0]; |
427 | > | atomData[1] = pos[1]; |
428 | > | atomData[2] = pos[2]; |
429 | ||
430 | < | if( atoms[local_index]->isDirectional() ){ |
430 | > | atomData[3] = vel[0]; |
431 | > | atomData[4] = vel[1]; |
432 | > | atomData[5] = vel[2]; |
433 | > | |
434 | > | isDirectional = 0; |
435 | ||
436 | < | isDirectional = 1; |
427 | < | |
428 | < | dAtom = (DirectionalAtom *)atoms[local_index]; |
429 | < | dAtom->getQ( q ); |
436 | > | if( sd->isDirectional() ){ |
437 | ||
438 | < | for (int j = 0; j < 6 ; j++) |
439 | < | atomData13[j] = atomData6[j]; |
440 | < | |
441 | < | atomData13[6] = q[0]; |
442 | < | atomData13[7] = q[1]; |
443 | < | atomData13[8] = q[2]; |
444 | < | atomData13[9] = q[3]; |
445 | < | |
446 | < | atomData13[10] = dAtom->getJx(); |
447 | < | atomData13[11] = dAtom->getJy(); |
448 | < | atomData13[12] = dAtom->getJz(); |
449 | < | } |
450 | < | |
451 | < | } else { |
452 | < | sprintf(painCave.errMsg, |
453 | < | "Atom %d not found on processor %d, currentIndex = %d, local_index = %d\n", |
454 | < | which_atom, worldRank, currentIndex, local_index ); |
455 | < | haveError= 1; |
456 | < | simError(); |
450 | < | } |
451 | < | |
452 | < | if(haveError) DieDieDie(); |
438 | > | isDirectional = 1; |
439 | > | |
440 | > | sd->getQ( q ); |
441 | > | sd->getJ( ji ); |
442 | > | |
443 | > | for (int j = 0; j < 6 ; j++) |
444 | > | atomData[j] = atomData[j]; |
445 | > | |
446 | > | atomData[6] = q[0]; |
447 | > | atomData[7] = q[1]; |
448 | > | atomData[8] = q[2]; |
449 | > | atomData[9] = q[3]; |
450 | > | |
451 | > | atomData[10] = ji[0]; |
452 | > | atomData[11] = ji[1]; |
453 | > | atomData[12] = ji[2]; |
454 | > | } |
455 | > | |
456 | > | } |
457 | ||
458 | < | currentIndex++; |
458 | > | currentIndex++; |
459 | } | |
460 | // If we've survived to here, format the line: | |
461 | ||
# | Line 460 | Line 464 | void DumpWriter::writeFrame( vector<ofstream*>& outFil | |
464 | sprintf( writeLine, | |
465 | "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t", | |
466 | atomTypeString, | |
467 | < | atomData6[0], |
468 | < | atomData6[1], |
469 | < | atomData6[2], |
470 | < | atomData6[3], |
471 | < | atomData6[4], |
472 | < | atomData6[5]); |
467 | > | atomData[0], |
468 | > | atomData[1], |
469 | > | atomData[2], |
470 | > | atomData[3], |
471 | > | atomData[4], |
472 | > | atomData[5]); |
473 | ||
474 | strcat( writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n" ); | |
475 | ||
# | Line 474 | Line 478 | void DumpWriter::writeFrame( vector<ofstream*>& outFil | |
478 | sprintf( writeLine, | |
479 | "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\n", | |
480 | atomTypeString, | |
481 | < | atomData13[0], |
482 | < | atomData13[1], |
483 | < | atomData13[2], |
484 | < | atomData13[3], |
485 | < | atomData13[4], |
486 | < | atomData13[5], |
487 | < | atomData13[6], |
488 | < | atomData13[7], |
489 | < | atomData13[8], |
490 | < | atomData13[9], |
491 | < | atomData13[10], |
492 | < | atomData13[11], |
493 | < | atomData13[12]); |
481 | > | atomData[0], |
482 | > | atomData[1], |
483 | > | atomData[2], |
484 | > | atomData[3], |
485 | > | atomData[4], |
486 | > | atomData[5], |
487 | > | atomData[6], |
488 | > | atomData[7], |
489 | > | atomData[8], |
490 | > | atomData[9], |
491 | > | atomData[10], |
492 | > | atomData[11], |
493 | > | atomData[12]); |
494 | ||
495 | } | |
496 | ||
# | Line 513 | Line 517 | void DumpWriter::writeFrame( vector<ofstream*>& outFil | |
517 | myPotato = 0; | |
518 | currentIndex = 0; | |
519 | ||
520 | < | for (i = 0 ; i < mpiSim->getTotAtoms(); i++ ) { |
520 | > | for (i = 0 ; i < mpiSim->getTotNmol(); i++ ) { |
521 | ||
522 | < | // Am I the node which has this atom? |
522 | > | // Am I the node which has this integrableObject? |
523 | ||
524 | < | if (AtomToProcMap[i] == worldRank) { |
524 | > | if (MolToProcMap[i] == worldRank) { |
525 | ||
526 | < | if (myPotato + 3 >= MAXTAG) { |
526 | > | |
527 | > | if (myPotato + 1 >= MAXTAG) { |
528 | ||
529 | // The potato was going to exceed the maximum value, | |
530 | // so wrap this processor potato back to 0 (and block until | |
# | Line 528 | Line 533 | void DumpWriter::writeFrame( vector<ofstream*>& outFil | |
533 | MPI_Recv(&myPotato, 1, MPI_INT, 0, 0, MPI_COMM_WORLD, &istatus); | |
534 | ||
535 | } | |
531 | – | which_atom = i; |
536 | ||
537 | < | //local_index = -1; |
537 | > | local_index = indexArray[currentIndex].first; |
538 | > | integrableObjects = entry_plug->molecules[local_index].getIntegrableObjects(); |
539 | > | |
540 | > | nCurObj = integrableObjects.size(); |
541 | > | |
542 | > | MPI_Send(&nCurObj, 1, MPI_INT, 0, |
543 | > | myPotato, MPI_COMM_WORLD); |
544 | > | myPotato++; |
545 | ||
546 | < | //for (j=0; (j<mpiSim->getMyNlocal()) && (local_index < 0); j++) { |
536 | < | // if (atoms[j]->getGlobalIndex() == which_atom) local_index = j; |
537 | < | //} |
538 | < | |
539 | < | //if (local_index != -1) { |
546 | > | for( iter = integrableObjects.begin(); iter != integrableObjects.end(); iter++){ |
547 | ||
548 | < | local_index = indexArray[currentIndex].first; |
548 | > | if (myPotato + 2 >= MAXTAG) { |
549 | > | |
550 | > | // The potato was going to exceed the maximum value, |
551 | > | // so wrap this processor potato back to 0 (and block until |
552 | > | // node 0 says we can go: |
553 | > | |
554 | > | MPI_Recv(&myPotato, 1, MPI_INT, 0, 0, MPI_COMM_WORLD, &istatus); |
555 | > | |
556 | > | } |
557 | > | |
558 | > | sd = *iter; |
559 | > | |
560 | > | atomTypeString = sd->getType(); |
561 | > | |
562 | > | sd->getPos(pos); |
563 | > | sd->getVel(vel); |
564 | > | |
565 | > | atomData[0] = pos[0]; |
566 | > | atomData[1] = pos[1]; |
567 | > | atomData[2] = pos[2]; |
568 | > | |
569 | > | atomData[3] = vel[0]; |
570 | > | atomData[4] = vel[1]; |
571 | > | atomData[5] = vel[2]; |
572 | > | |
573 | > | isDirectional = 0; |
574 | > | |
575 | > | if( sd->isDirectional() ){ |
576 | > | |
577 | > | isDirectional = 1; |
578 | ||
579 | < | if (which_atom == indexArray[currentIndex].second) { |
580 | < | |
581 | < | atomTypeString = atoms[local_index]->getType(); |
582 | < | |
583 | < | atoms[local_index]->getPos(pos); |
584 | < | atoms[local_index]->getVel(vel); |
585 | < | |
586 | < | atomData6[0] = pos[0]; |
587 | < | atomData6[1] = pos[1]; |
588 | < | atomData6[2] = pos[2]; |
579 | > | sd->getQ( q ); |
580 | > | sd->getJ( ji ); |
581 | > | |
582 | > | |
583 | > | atomData[6] = q[0]; |
584 | > | atomData[7] = q[1]; |
585 | > | atomData[8] = q[2]; |
586 | > | atomData[9] = q[3]; |
587 | > | |
588 | > | atomData[10] = ji[0]; |
589 | > | atomData[11] = ji[1]; |
590 | > | atomData[12] = ji[2]; |
591 | > | } |
592 | ||
593 | < | atomData6[3] = vel[0]; |
594 | < | atomData6[4] = vel[1]; |
556 | < | atomData6[5] = vel[2]; |
557 | < | |
558 | < | isDirectional = 0; |
593 | > | |
594 | > | strncpy(MPIatomTypeString, atomTypeString, MINIBUFFERSIZE); |
595 | ||
596 | < | if( atoms[local_index]->isDirectional() ){ |
596 | > | // null terminate the string before sending (just in case): |
597 | > | MPIatomTypeString[MINIBUFFERSIZE-1] = '\0'; |
598 | ||
599 | < | isDirectional = 1; |
599 | > | MPI_Send(MPIatomTypeString, MINIBUFFERSIZE, MPI_CHAR, 0, |
600 | > | myPotato, MPI_COMM_WORLD); |
601 | ||
602 | < | dAtom = (DirectionalAtom *)atoms[local_index]; |
565 | < | dAtom->getQ( q ); |
602 | > | myPotato++; |
603 | ||
604 | < | for (int j = 0; j < 6 ; j++) |
568 | < | atomData13[j] = atomData6[j]; |
569 | < | |
570 | < | atomData13[6] = q[0]; |
571 | < | atomData13[7] = q[1]; |
572 | < | atomData13[8] = q[2]; |
573 | < | atomData13[9] = q[3]; |
574 | < | |
575 | < | atomData13[10] = dAtom->getJx(); |
576 | < | atomData13[11] = dAtom->getJy(); |
577 | < | atomData13[12] = dAtom->getJz(); |
578 | < | } |
604 | > | if (isDirectional) { |
605 | ||
606 | < | } else { |
607 | < | sprintf(painCave.errMsg, |
608 | < | "Atom %d not found on processor %d, currentIndex = %d, local_index = %d\n", |
609 | < | which_atom, worldRank, currentIndex, local_index ); |
584 | < | haveError= 1; |
585 | < | simError(); |
586 | < | } |
587 | < | |
588 | < | strncpy(MPIatomTypeString, atomTypeString, MINIBUFFERSIZE); |
606 | > | MPI_Send(atomData, 13, MPI_DOUBLE, 0, |
607 | > | myPotato, MPI_COMM_WORLD); |
608 | > | |
609 | > | } else { |
610 | ||
611 | < | // null terminate the string before sending (just in case): |
612 | < | MPIatomTypeString[MINIBUFFERSIZE-1] = '\0'; |
611 | > | MPI_Send(atomData, 6, MPI_DOUBLE, 0, |
612 | > | myPotato, MPI_COMM_WORLD); |
613 | > | } |
614 | ||
615 | < | MPI_Send(MPIatomTypeString, MINIBUFFERSIZE, MPI_CHAR, 0, |
594 | < | myPotato, MPI_COMM_WORLD); |
595 | < | |
596 | < | myPotato++; |
615 | > | myPotato++; |
616 | ||
617 | < | MPI_Send(&isDirectional, 1, MPI_INT, 0, |
599 | < | myPotato, MPI_COMM_WORLD); |
600 | < | |
601 | < | myPotato++; |
602 | < | |
603 | < | if (isDirectional) { |
617 | > | } |
618 | ||
619 | < | MPI_Send(atomData13, 13, MPI_DOUBLE, 0, |
606 | < | myPotato, MPI_COMM_WORLD); |
619 | > | currentIndex++; |
620 | ||
608 | – | } else { |
609 | – | |
610 | – | MPI_Send(atomData6, 6, MPI_DOUBLE, 0, |
611 | – | myPotato, MPI_COMM_WORLD); |
621 | } | |
622 | < | |
614 | < | myPotato++; |
615 | < | currentIndex++; |
622 | > | |
623 | } | |
617 | – | } |
624 | ||
625 | sprintf( checkPointMsg, | |
626 | "Sucessfully took a dump.\n"); | |
627 | < | MPIcheckPoint(); |
627 | > | MPIcheckPoint(); |
628 | ||
629 | < | } |
629 | > | } |
630 | > | |
631 | > | |
632 | ||
633 | #endif // is_mpi | |
634 | } |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |