ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE/libmdtools/DumpWriter.cpp
(Generate patch)

Comparing trunk/OOPSE/libmdtools/DumpWriter.cpp (file contents):
Revision 927 by tim, Mon Jan 12 22:54:42 2004 UTC vs.
Revision 929 by tim, Tue Jan 13 15:46:49 2004 UTC

# Line 3 | Line 3
3   #include <string.h>
4   #include <iostream>
5   #include <fstream>
6 + #include <algorithm>
7 + #include <utility>
8  
9   #ifdef IS_MPI
10   #include <mpi.h>
# Line 26 | Line 28 | DumpWriter::DumpWriter( SimInfo* the_entry_plug ){
28    if(worldRank == 0 ){
29   #endif // is_mpi
30  
29 –    strcpy( outName, entry_plug->sampleName );
31  
32 <    outFile.open(outName, ios::out | ios::trunc );
32 >    dumpFile.open(entry_plug->sampleName, ios::out | ios::trunc );
33  
34 <    if( !outFile ){
34 >    if( !dumpFile ){
35  
36        sprintf( painCave.errMsg,
37                 "Could not open \"%s\" for dump output.\n",
38 <               outName);
38 >               entry_plug->sampleName);
39        painCave.isFatal = 1;
40        simError();
41      }
# Line 44 | Line 45 | DumpWriter::DumpWriter( SimInfo* the_entry_plug ){
45   #ifdef IS_MPI
46    }
47  
48 +  //sort the local atoms by global index
49 +  sortByGlobalIndex();
50 +  
51    sprintf( checkPointMsg,
52             "Sucessfully opened output file for dumping.\n");
53    MPIcheckPoint();
# Line 56 | Line 60 | DumpWriter::~DumpWriter( ){
60    if(worldRank == 0 ){
61   #endif // is_mpi
62  
63 <    outFile.close();
63 >    dumpFile.close();
64  
65   #ifdef IS_MPI
66    }
67   #endif // is_mpi
68   }
69  
70 < void DumpWriter::writeDump( double currentTime ){
70 > #ifdef IS_MPI
71 >
72 > /**
73 > * A hook function to load balancing
74 > */
75 >
76 > void DumpWriter::update(){
77 >  sortByGlobalIndex();          
78 > }
79 >  
80 > /**
81 > * Auxiliary sorting function
82 > */
83 >
84 > bool indexSortingCriterion(const pair<int, int>& p1, const pair<int, int>& p2){
85 >  return p1.second < p2.second;
86 > }
87 >
88 > /**
89 > * Sorting the local index by global index
90 > */
91 >
92 > void DumpWriter::sortByGlobalIndex(){
93 >  Atom** atoms = entry_plug->atoms;
94 >  
95 >  indexArray.clear();
96 >  
97 >  for(int i = 0; i < mpiSim->getMyNlocal();i++)
98 >    indexArray.push_back(make_pair(i, atoms[i]->getGlobalIndex()));
99 >  
100 >  sort(indexArray.begin(), indexArray.end(), indexSortingCriterion);    
101 > }
102 > #endif
103 >
104 > void DumpWriter::writeDump(double currentTime){
105 >  
106 > // write to eor file
107 >  writeFinal(currentTime);
108 >
109 > //write to dump file
110 >  writeFrame(dumpFile, currentTime);
111 >        
112 > }
113 >
114 > void DumpWriter::writeFinal(double currentTime){
115 >
116 >  ofstream finalOut;    
117 >  
118 >  //Open eor file
119 > #ifdef IS_MPI
120 >  if(worldRank == 0 ){
121 > #endif // is_mpi
122 >
123 >    finalOut.open( entry_plug->finalName, ios::out | ios::trunc );
124 >    if( !finalOut ){
125 >      sprintf( painCave.errMsg,
126 >               "Could not open \"%s\" for final dump output.\n",
127 >               entry_plug->finalName );
128 >      painCave.isFatal = 1;
129 >      simError();
130 >    }
131 >    
132 > #ifdef IS_MPI
133 >  }
134 > #endif
135 >  
136 >  //write to eor file  
137 >  writeFrame(finalOut, currentTime);
138 >  
139 >  //close eor file      
140 > #ifdef IS_MPI
141 >  if(worldRank == 0 ){
142 >    finalOut.close();
143 >  }
144 > #endif // is_mpi
145  
146 + }
147 +
148 + void DumpWriter::writeFrame( ofstream& outFile, double currentTime ){
149 +
150    const int BUFFERSIZE = 2000;
151    const int MINIBUFFERSIZE = 100;
152  
# Line 79 | Line 161 | void DumpWriter::writeDump( double currentTime ){
161    int myPotato;
162  
163    int nProc;
164 <  int j, which_node, done, which_atom, local_index;
164 >  int j, which_node, done, which_atom, local_index, currentIndex;
165    double atomData6[6];
166    double atomData13[13];
167    int isDirectional;
# Line 95 | Line 177 | void DumpWriter::writeDump( double currentTime ){
177    Atom** atoms = entry_plug->atoms;
178    double pos[3], vel[3];
179  
98 –  // write current frame to the eor file
99 –
100 –  this->writeFinal( currentTime );
101 –
180   #ifndef IS_MPI
181  
182    outFile << nAtoms << "\n";
# Line 156 | Line 234 | void DumpWriter::writeDump( double currentTime ){
234  
235      outFile << writeLine;
236    }
159 –  outFile.flush();
237  
238   #else // is_mpi
239  
# Line 205 | Line 282 | void DumpWriter::writeDump( double currentTime ){
282      outFile << entry_plug->the_integrator->getAdditionalParameters();
283      outFile << endl;
284      outFile.flush();
285 <
285 >    
286 >    currentIndex = 0;
287      for (i = 0 ; i < mpiSim->getTotAtoms(); i++ ) {
288        
289        // Get the Node number which has this atom;
# Line 228 | Line 306 | void DumpWriter::writeDump( double currentTime ){
306          MPI_Recv(MPIatomTypeString, MINIBUFFERSIZE, MPI_CHAR, which_node,
307                   myPotato, MPI_COMM_WORLD, &istatus);
308          
231 –        //strncpy(atomTypeString, MPIatomTypeString, MINIBUFFERSIZE);
232 –        
233 –        // Null terminate the atomTypeString just in case:
234 –
235 –        //atomTypeString[strlen(atomTypeString) - 1] = '\0';
309          atomTypeString = MPIatomTypeString;
310          
311          myPotato++;
# Line 257 | Line 330 | void DumpWriter::writeDump( double currentTime ){
330          
331          haveError = 0;
332          which_atom = i;
333 <        local_index=-1;
334 <        
335 <        for (j=0; (j<mpiSim->getMyNlocal()) && (local_index < 0); j++) {
336 <          if (atoms[j]->getGlobalIndex() == which_atom) local_index = j;
264 <        }
265 <        
266 <        if (local_index != -1) {
333 >        
334 >        local_index = indexArray[currentIndex].first;        
335 >                
336 >        if (which_atom == indexArray[currentIndex].second) {
337            
338            atomTypeString = atoms[local_index]->getType();
339  
# Line 310 | Line 380 | void DumpWriter::writeDump( double currentTime ){
380          
381          if(haveError) DieDieDie();
382          
383 +        currentIndex ++;
384        }
385        // If we've survived to here, format the line:
386        
387        if (!isDirectional) {
388          
389 <        sprintf( tempBuffer,
389 >        sprintf( writeLine,
390                   "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t",
391                   atomTypeString,
392                   atomData6[0],
# Line 324 | Line 395 | void DumpWriter::writeDump( double currentTime ){
395                   atomData6[3],
396                   atomData6[4],
397                   atomData6[5]);
398 <        
328 <        strcpy( writeLine, tempBuffer );
398 >
399          strcat( writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n" );
400          
401        } else {
402          
403 <        sprintf( tempBuffer,
403 >        sprintf( writeLine,
404                   "%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",
405                   atomTypeString,
406                   atomData13[0],
# Line 346 | Line 416 | void DumpWriter::writeDump( double currentTime ){
416                   atomData13[10],
417                   atomData13[11],
418                   atomData13[12]);
349 –        
350 –        strcpy( writeLine, tempBuffer );
419          
420        }
421        
422        outFile << writeLine;
355 –      outFile.flush();
423      }
424      
425  
# Line 368 | Line 435 | void DumpWriter::writeDump( double currentTime ){
435      // Set my magic potato to 0:
436  
437      myPotato = 0;
438 +    currentIndex = 0;
439      
440      for (i = 0 ; i < mpiSim->getTotAtoms(); i++ ) {
441        
# Line 385 | Line 453 | void DumpWriter::writeDump( double currentTime ){
453            
454          }
455          which_atom = i;
456 <        local_index=-1;
389 <        for (j=0; (j<mpiSim->getMyNlocal()) && (local_index < 0); j++) {
390 <          if (atoms[j]->getGlobalIndex() == which_atom) local_index = j;
391 <        }
392 <        if (local_index != -1) {
393 <        
394 <          atomTypeString = atoms[local_index]->getType();
395 <
396 <          atoms[local_index]->getPos(pos);
397 <          atoms[local_index]->getVel(vel);
398 <
399 <          atomData6[0] = pos[0];
400 <          atomData6[1] = pos[1];
401 <          atomData6[2] = pos[2];
402 <
403 <          atomData6[3] = vel[0];
404 <          atomData6[4] = vel[1];
405 <          atomData6[5] = vel[2];
406 <          
407 <          isDirectional = 0;
408 <
409 <          if( atoms[local_index]->isDirectional() ){
410 <
411 <            isDirectional = 1;
412 <            
413 <            dAtom = (DirectionalAtom *)atoms[local_index];
414 <            dAtom->getQ( q );
415 <            
416 <            for (int j = 0; j < 6 ; j++)
417 <              atomData13[j] = atomData6[j];
418 <            
419 <            atomData13[6] = q[0];
420 <            atomData13[7] = q[1];
421 <            atomData13[8] = q[2];
422 <            atomData13[9] = q[3];
423 <
424 <            atomData13[10] = dAtom->getJx();
425 <            atomData13[11] = dAtom->getJy();
426 <            atomData13[12] = dAtom->getJz();
427 <          }
428 <
429 <        } else {
430 <          sprintf(painCave.errMsg,
431 <                  "Atom %d not found on processor %d\n",
432 <                  i, worldRank );
433 <          haveError= 1;
434 <          simError();
435 <        }
436 <
437 <        strncpy(MPIatomTypeString, atomTypeString, MINIBUFFERSIZE);
438 <
439 <        // null terminate the string before sending (just in case):
440 <        MPIatomTypeString[MINIBUFFERSIZE-1] = '\0';
441 <
442 <        MPI_Send(MPIatomTypeString, MINIBUFFERSIZE, MPI_CHAR, 0,
443 <                 myPotato, MPI_COMM_WORLD);
444 <        
445 <        myPotato++;
446 <
447 <        MPI_Send(&isDirectional, 1, MPI_INT, 0,
448 <                 myPotato, MPI_COMM_WORLD);
449 <        
450 <        myPotato++;
451 <        
452 <        if (isDirectional) {
453 <
454 <          MPI_Send(atomData13, 13, MPI_DOUBLE, 0,
455 <                   myPotato, MPI_COMM_WORLD);
456 <          
457 <        } else {
458 <
459 <          MPI_Send(atomData6, 6, MPI_DOUBLE, 0,
460 <                   myPotato, MPI_COMM_WORLD);
461 <        }
462 <
463 <        myPotato++;      
464 <      }
465 <    }
466 <
467 <    sprintf( checkPointMsg,
468 <             "Sucessfully took a dump.\n");
469 <    MPIcheckPoint();        
470 <    
471 <  }
472 <  
473 < #endif // is_mpi
474 < }
475 <
476 < void DumpWriter::writeFinal(double finalTime){
477 <
478 <  char finalName[500];
479 <  ofstream finalOut;
480 <
481 <  const int BUFFERSIZE = 2000;
482 <  const int MINIBUFFERSIZE = 100;
483 <  char tempBuffer[BUFFERSIZE];
484 <  char writeLine[BUFFERSIZE];
485 <
486 <  double q[4];
487 <  DirectionalAtom* dAtom;
488 <  Atom** atoms = entry_plug->atoms;
489 <  int i;
490 < #ifdef IS_MPI
491 <  
492 <  int *potatoes;
493 <  int myPotato;
494 <
495 <  int nProc;
496 <  int j, which_node, done, which_atom, local_index;
497 <  double atomData6[6];
498 <  double atomData13[13];
499 <  int isDirectional;
500 <  char* atomTypeString;
501 <  char MPIatomTypeString[MINIBUFFERSIZE];
502 <
503 < #else //is_mpi
504 <  int nAtoms = entry_plug->n_atoms;
505 < #endif //is_mpi
506 <
507 <  double pos[3], vel[3];
508 <
509 < #ifdef IS_MPI
510 <  if(worldRank == 0 ){
511 < #endif // is_mpi
512 <
513 <    strcpy( finalName, entry_plug->finalName );
514 <
515 <    finalOut.open( finalName, ios::out | ios::trunc );
516 <    if( !finalOut ){
517 <      sprintf( painCave.errMsg,
518 <               "Could not open \"%s\" for final dump output.\n",
519 <               finalName );
520 <      painCave.isFatal = 1;
521 <      simError();
522 <    }
523 <
524 <    // finalOut.setf( ios::scientific );
525 <
526 < #ifdef IS_MPI
527 <  }
528 <
529 <  sprintf(checkPointMsg,"Opened file for final configuration\n");
530 <  MPIcheckPoint();
531 <
532 < #endif //is_mpi
533 <
534 <
535 < #ifndef IS_MPI
536 <
537 <  finalOut << nAtoms << "\n";
538 <
539 <  finalOut << finalTime << ";\t"
540 <           << entry_plug->Hmat[0][0] << "\t"
541 <           << entry_plug->Hmat[1][0] << "\t"
542 <           << entry_plug->Hmat[2][0] << ";\t"
543 <
544 <           << entry_plug->Hmat[0][1] << "\t"
545 <           << entry_plug->Hmat[1][1] << "\t"
546 <           << entry_plug->Hmat[2][1] << ";\t"
547 <
548 <           << entry_plug->Hmat[0][2] << "\t"
549 <           << entry_plug->Hmat[1][2] << "\t"
550 <           << entry_plug->Hmat[2][2] << ";";
551 <
552 <  //write out additional parameters, such as chi and eta
553 <  finalOut << entry_plug->the_integrator->getAdditionalParameters();
554 <  finalOut << endl;
555 <
556 <  for( i=0; i<nAtoms; i++ ){
557 <
558 <    atoms[i]->getPos(pos);
559 <    atoms[i]->getVel(vel);
560 <
561 <    sprintf( tempBuffer,
562 <             "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t",
563 <             atoms[i]->getType(),
564 <             pos[0],
565 <             pos[1],
566 <             pos[2],
567 <             vel[0],
568 <             vel[1],
569 <             vel[2]);
570 <    strcpy( writeLine, tempBuffer );
571 <
572 <    if( atoms[i]->isDirectional() ){
573 <
574 <      dAtom = (DirectionalAtom *)atoms[i];
575 <      dAtom->getQ( q );
576 <
577 <      sprintf( tempBuffer,
578 <               "%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\n",
579 <               q[0],
580 <               q[1],
581 <               q[2],
582 <               q[3],
583 <               dAtom->getJx(),
584 <               dAtom->getJy(),
585 <               dAtom->getJz());
586 <      strcat( writeLine, tempBuffer );
587 <    }
588 <    else
589 <      strcat( writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n" );
590 <
591 <    finalOut << writeLine;
592 <  }
593 <  finalOut.flush();
594 <  finalOut.close();
595 <
596 < #else // is_mpi
597 <
598 <  /* code to find maximum tag value */
599 <  int *tagub, flag, MAXTAG;
600 <  MPI_Attr_get(MPI_COMM_WORLD, MPI_TAG_UB, &tagub, &flag);
601 <  if (flag) {
602 <    MAXTAG = *tagub;
603 <  } else {
604 <    MAXTAG = 32767;
605 <  }  
606 <
607 <  int haveError;
608 <
609 <  MPI_Status istatus;
610 <  int *AtomToProcMap = mpiSim->getAtomToProcMap();
611 <
612 <  // write out header and node 0's coordinates
613 <
614 <  if( worldRank == 0 ){
615 <
616 <    // Node 0 needs a list of the magic potatoes for each processor;
617 <
618 <    nProc = mpiSim->getNumberProcessors();
619 <    potatoes = new int[nProc];
620 <
621 <    for (i = 0; i < nProc; i++)
622 <      potatoes[i] = 0;
623 <    
624 <    finalOut << mpiSim->getTotAtoms() << "\n";
625 <
626 <    finalOut << finalTime << ";\t"
627 <            << entry_plug->Hmat[0][0] << "\t"
628 <            << entry_plug->Hmat[1][0] << "\t"
629 <            << entry_plug->Hmat[2][0] << ";\t"
630 <
631 <            << entry_plug->Hmat[0][1] << "\t"
632 <            << entry_plug->Hmat[1][1] << "\t"
633 <            << entry_plug->Hmat[2][1] << ";\t"
634 <
635 <            << entry_plug->Hmat[0][2] << "\t"
636 <            << entry_plug->Hmat[1][2] << "\t"
637 <            << entry_plug->Hmat[2][2] << ";";
638 <
639 <    finalOut << entry_plug->the_integrator->getAdditionalParameters();
640 <    finalOut << endl;
641 <    finalOut.flush();
642 <
643 <    for (i = 0 ; i < mpiSim->getTotAtoms(); i++ ) {
644 <      
645 <      // Get the Node number which has this atom;
646 <      
647 <      which_node = AtomToProcMap[i];
648 <      
649 <      if (which_node != 0) {
650 <
651 <        if (potatoes[which_node] + 3 >= MAXTAG) {
652 <          // The potato was going to exceed the maximum value,
653 <          // so wrap this processor potato back to 0:        
654 <
655 <          potatoes[which_node] = 0;          
656 <          MPI_Send(0, 1, MPI_INT, which_node, 0, MPI_COMM_WORLD);
657 <          
658 <        }
659 <
660 <        myPotato = potatoes[which_node];        
661 <        
662 <        MPI_Recv(MPIatomTypeString, MINIBUFFERSIZE, MPI_CHAR, which_node,
663 <                 myPotato, MPI_COMM_WORLD, &istatus);
664 <        
665 <        atomTypeString = MPIatomTypeString;
456 >        local_index = indexArray[currentIndex].first;        
457                  
458 <        myPotato++;
668 <
669 <        MPI_Recv(&isDirectional, 1, MPI_INT, which_node,
670 <                 myPotato, MPI_COMM_WORLD, &istatus);
671 <              
672 <        myPotato++;
673 <
674 <        if (isDirectional) {          
675 <          MPI_Recv(atomData13, 13, MPI_DOUBLE, which_node,
676 <                   myPotato, MPI_COMM_WORLD, &istatus);
677 <        } else {
678 <          MPI_Recv(atomData6, 6, MPI_DOUBLE, which_node,
679 <                   myPotato, MPI_COMM_WORLD, &istatus);          
680 <        }
681 <        
682 <        myPotato++;
683 <        potatoes[which_node] = myPotato;
684 <
685 <      } else {
686 <        
687 <        haveError = 0;
688 <        which_atom = i;
689 <        local_index=-1;
690 <        
691 <        for (j=0; (j<mpiSim->getMyNlocal()) && (local_index < 0); j++) {
692 <          if (atoms[j]->getGlobalIndex() == which_atom) local_index = j;
693 <        }
694 <        
695 <        if (local_index != -1) {
696 <          
697 <          atomTypeString = atoms[local_index]->getType();
698 <
699 <          atoms[local_index]->getPos(pos);
700 <          atoms[local_index]->getVel(vel);          
701 <
702 <          atomData6[0] = pos[0];
703 <          atomData6[1] = pos[1];
704 <          atomData6[2] = pos[2];
705 <
706 <          atomData6[3] = vel[0];
707 <          atomData6[4] = vel[1];
708 <          atomData6[5] = vel[2];
709 <          
710 <          isDirectional = 0;
711 <
712 <          if( atoms[local_index]->isDirectional() ){
713 <
714 <            isDirectional = 1;
715 <            
716 <            dAtom = (DirectionalAtom *)atoms[local_index];
717 <            dAtom->getQ( q );
718 <
719 <            for (int j = 0; j < 6 ; j++)
720 <              atomData13[j] = atomData6[j];            
721 <            
722 <            atomData13[6] = q[0];
723 <            atomData13[7] = q[1];
724 <            atomData13[8] = q[2];
725 <            atomData13[9] = q[3];
726 <            
727 <            atomData13[10] = dAtom->getJx();
728 <            atomData13[11] = dAtom->getJy();
729 <            atomData13[12] = dAtom->getJz();
730 <          }
731 <          
732 <        } else {
733 <          sprintf(painCave.errMsg,
734 <                  "Atom %d not found on processor %d\n",
735 <                  i, worldRank );
736 <          haveError= 1;
737 <          simError();
738 <        }
739 <        
740 <        if(haveError) DieDieDie();
741 <        
742 <      }
743 <
744 <
745 <      // If we've survived to here, format the line:
746 <      
747 <      if (!isDirectional) {
748 <        
749 <        sprintf( tempBuffer,
750 <                 "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t",
751 <                 atomTypeString,
752 <                 atomData6[0],
753 <                 atomData6[1],
754 <                 atomData6[2],
755 <                 atomData6[3],
756 <                 atomData6[4],
757 <                 atomData6[5]);
758 <        
759 <        strcpy( writeLine, tempBuffer );
760 <        strcat( writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n" );
761 <        
762 <      } else {
763 <        
764 <        sprintf( tempBuffer,
765 <                 "%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",
766 <                 atomTypeString,
767 <                 atomData13[0],
768 <                 atomData13[1],
769 <                 atomData13[2],
770 <                 atomData13[3],
771 <                 atomData13[4],
772 <                 atomData13[5],
773 <                 atomData13[6],
774 <                 atomData13[7],
775 <                 atomData13[8],
776 <                 atomData13[9],
777 <                 atomData13[10],
778 <                 atomData13[11],
779 <                 atomData13[12]);
780 <        
781 <        strcpy( writeLine, tempBuffer );
782 <        
783 <      }
784 <        
785 <      finalOut << writeLine;
786 <      finalOut.flush();
787 <    }
788 <  
789 <    finalOut.flush();
790 <    sprintf( checkPointMsg,
791 <             "Sucessfully took a dump.\n");
792 <    delete[] potatoes;
793 <    
794 <    MPIcheckPoint();        
795 <    
796 <  } else {
797 <
798 <    // worldRank != 0, so I'm a remote node.  
799 <
800 <    // Set my magic potato to 0:
801 <
802 <    myPotato = 0;
803 <    
804 <    for (i = 0 ; i < mpiSim->getTotAtoms(); i++ ) {
805 <      
806 <      // Am I the node which has this atom?
807 <      
808 <      if (AtomToProcMap[i] == worldRank) {
809 <
810 <        if (myPotato + 3 >= MAXTAG) {
811 <
812 <          // The potato was going to exceed the maximum value,
813 <          // so wrap this processor potato back to 0 (and block until
814 <          // node 0 says we can go:
815 <
816 <          MPI_Recv(&myPotato, 1, MPI_INT, 0, 0, MPI_COMM_WORLD, &istatus);
817 <          
818 <        }
819 <        which_atom = i;  
820 <        local_index=-1;
821 <        for (j=0; (j<mpiSim->getMyNlocal()) && (local_index < 0); j++) {
822 <          if (atoms[j]->getGlobalIndex() == which_atom) local_index = j;
823 <        }
824 <        if (local_index != -1) {
458 >        if (which_atom == indexArray[currentIndex].second) {
459          
460            atomTypeString = atoms[local_index]->getType();
461  
# Line 892 | Line 526 | void DumpWriter::writeFinal(double finalTime){
526                     myPotato, MPI_COMM_WORLD);
527          }
528  
529 <        myPotato++;      
529 >        myPotato++;  
530 >        currentIndex++;    
531        }
532      }
533  
# Line 902 | Line 537 | void DumpWriter::writeFinal(double finalTime){
537      
538    }
539    
905 –  if( worldRank == 0 ) finalOut.close();
540   #endif // is_mpi
541   }
542  
909 –
910 –
543   #ifdef IS_MPI
544  
545   // a couple of functions to let us escape the write loop

Diff Legend

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