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 829 by gezelter, Tue Oct 28 16:03:37 2003 UTC vs.
Revision 952 by tim, Fri Jan 16 21:55:39 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>
11   #include "mpiSimulation.hpp"
10 – #define TAKE_THIS_TAG_CHAR 1
11 – #define TAKE_THIS_TAG_INT 2
12  
13   namespace dWrite{
14 <  void nodeZeroError( void );
15 <  void anonymousNodeDie( void );
14 >  void DieDieDie( void );
15   }
16  
17   using namespace dWrite;
# Line 28 | Line 27 | DumpWriter::DumpWriter( SimInfo* the_entry_plug ){
27   #ifdef IS_MPI
28    if(worldRank == 0 ){
29   #endif // is_mpi
30 <    
31 <    strcpy( outName, entry_plug->sampleName );
32 <    
33 <    outFile.open(outName, ios::out | ios::trunc );
34 <    
36 <    if( !outFile ){
37 <      
30 >
31 >    dumpFile.open(entry_plug->sampleName, ios::out | ios::trunc );
32 >
33 >    if( !dumpFile ){
34 >
35        sprintf( painCave.errMsg,
36                 "Could not open \"%s\" for dump output.\n",
37 <               outName);
37 >               entry_plug->sampleName);
38        painCave.isFatal = 1;
39        simError();
40      }
41  
45 –    //outFile.setf( ios::scientific );
46 –
42   #ifdef IS_MPI
43    }
44  
45 +  //sort the local atoms by global index
46 +  sortByGlobalIndex();
47 +  
48    sprintf( checkPointMsg,
49             "Sucessfully opened output file for dumping.\n");
50    MPIcheckPoint();
# Line 59 | Line 57 | DumpWriter::~DumpWriter( ){
57    if(worldRank == 0 ){
58   #endif // is_mpi
59  
60 <    outFile.close();
60 >    dumpFile.close();
61  
62   #ifdef IS_MPI
63    }
64   #endif // is_mpi
65   }
66  
67 < void DumpWriter::writeDump( double currentTime ){
67 > #ifdef IS_MPI
68 >
69 > /**
70 > * A hook function to load balancing
71 > */
72 >
73 > void DumpWriter::update(){
74 >  sortByGlobalIndex();          
75 > }
76    
77 + /**
78 + * Auxiliary sorting function
79 + */
80 +
81 + bool indexSortingCriterion(const pair<int, int>& p1, const pair<int, int>& p2){
82 +  return p1.second < p2.second;
83 + }
84 +
85 + /**
86 + * Sorting the local index by global index
87 + */
88 +
89 + void DumpWriter::sortByGlobalIndex(){
90 +  Atom** atoms = entry_plug->atoms;
91 +  
92 +  indexArray.clear();
93 +  
94 +  for(int i = 0; i < mpiSim->getMyNlocal();i++)
95 +    indexArray.push_back(make_pair(i, atoms[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 +    
103 + }
104 +
105 + #endif
106 +
107 + void DumpWriter::writeDump(double currentTime){
108 +
109 +  ofstream finalOut;
110 +  vector<ofstream*> fileStreams;
111 +
112 + #ifdef IS_MPI
113 +  if(worldRank == 0 ){
114 + #endif    
115 +    finalOut.open( entry_plug->finalName, ios::out | ios::trunc );
116 +    if( !finalOut ){
117 +      sprintf( painCave.errMsg,
118 +               "Could not open \"%s\" for final dump output.\n",
119 +               entry_plug->finalName );
120 +      painCave.isFatal = 1;
121 +      simError();
122 +    }
123 + #ifdef IS_MPI
124 +  }
125 + #endif // is_mpi
126 +
127 +  fileStreams.push_back(&finalOut);
128 +  fileStreams.push_back(&dumpFile);
129 +
130 +  writeFrame(fileStreams, currentTime);
131 +
132 + #ifdef IS_MPI
133 +  finalOut.close();
134 + #endif
135 +        
136 + }
137 +
138 + void DumpWriter::writeFinal(double currentTime){
139 +
140 +  ofstream finalOut;
141 +  vector<ofstream*> fileStreams;
142 +
143 + #ifdef IS_MPI
144 +  if(worldRank == 0 ){
145 + #endif // is_mpi
146 +
147 +    finalOut.open( entry_plug->finalName, ios::out | ios::trunc );
148 +
149 +    if( !finalOut ){
150 +      sprintf( painCave.errMsg,
151 +               "Could not open \"%s\" for final dump output.\n",
152 +               entry_plug->finalName );
153 +      painCave.isFatal = 1;
154 +      simError();
155 +    }
156 +
157 + #ifdef IS_MPI
158 +  }
159 + #endif // is_mpi
160 +  
161 +  fileStreams.push_back(&finalOut);  
162 +  writeFrame(fileStreams, currentTime);
163 +
164 + #ifdef IS_MPI
165 +  finalOut.close();
166 + #endif
167 +  
168 + }
169 +
170 + void DumpWriter::writeFrame( vector<ofstream*>& outFile, double currentTime ){
171 +
172    const int BUFFERSIZE = 2000;
173 <  char tempBuffer[BUFFERSIZE];
173 >  const int MINIBUFFERSIZE = 100;
174 >
175 >  char tempBuffer[BUFFERSIZE];  
176    char writeLine[BUFFERSIZE];
177  
178 <  int i;
178 >  int i, k;
179 >
180   #ifdef IS_MPI
181 <  int j, which_node, done, which_atom, local_index;
181 >  
182 >  /*********************************************************************
183 >   * Documentation?  You want DOCUMENTATION?
184 >   *
185 >   * Why all the potatoes below?  
186 >   *
187 >   * To make a long story short, the original version of DumpWriter
188 >   * worked in the most inefficient way possible.  Node 0 would
189 >   * poke each of the node for an individual atom's formatted data
190 >   * as node 0 worked its way down the global index. This was particularly
191 >   * inefficient since the method blocked all processors at every atom
192 >   * (and did it twice!).
193 >   *
194 >   * An intermediate version of DumpWriter could be described from Node
195 >   * zero's perspective as follows:
196 >   *
197 >   *  1) Have 100 of your friends stand in a circle.
198 >   *  2) When you say go, have all of them start tossing potatoes at
199 >   *     you (one at a time).
200 >   *  3) Catch the potatoes.
201 >   *
202 >   * It was an improvement, but MPI has buffers and caches that could
203 >   * best be described in this analogy as "potato nets", so there's no
204 >   * need to block the processors atom-by-atom.
205 >   *
206 >   * This new and improved DumpWriter works in an even more efficient
207 >   * way:
208 >   *
209 >   *  1) Have 100 of your friend stand in a circle.
210 >   *  2) When you say go, have them start tossing 5-pound bags of
211 >   *     potatoes at you.
212 >   *  3) Once you've caught a friend's bag of potatoes,
213 >   *     toss them a spud to let them know they can toss another bag.
214 >   *
215 >   * How's THAT for documentation?
216 >   *
217 >   *********************************************************************/
218 >
219 >  int *potatoes;
220 >  int myPotato;
221 >
222 >  int nProc;
223 >  int j, which_node, done, which_atom, local_index, currentIndex;
224 >  double atomData6[6];
225 >  double atomData13[13];
226 >  int isDirectional;
227 >  char* atomTypeString;
228 >  char MPIatomTypeString[MINIBUFFERSIZE];
229 >
230   #else //is_mpi
231    int nAtoms = entry_plug->n_atoms;
232   #endif //is_mpi
# Line 83 | Line 235 | void DumpWriter::writeDump( double currentTime ){
235    DirectionalAtom* dAtom;
236    Atom** atoms = entry_plug->atoms;
237    double pos[3], vel[3];
86 –    
87 –  
88 –  // write current frame to the eor file
238  
90 –  this->writeFinal( currentTime );
91 –
239   #ifndef IS_MPI
240 <    
241 <  outFile << nAtoms << "\n";
242 <    
96 <  outFile << currentTime << ";\t"
97 <          << entry_plug->Hmat[0][0] << "\t"
98 <          << entry_plug->Hmat[1][0] << "\t"
99 <          << entry_plug->Hmat[2][0] << ";\t"
240 >  
241 >  for(k = 0; k < outFile.size(); k++){
242 >    *outFile[k] << nAtoms << "\n";
243  
244 <          << entry_plug->Hmat[0][1] << "\t"
245 <          << entry_plug->Hmat[1][1] << "\t"
246 <          << entry_plug->Hmat[2][1] << ";\t"
244 >    *outFile[k] << currentTime << ";\t"
245 >               << entry_plug->Hmat[0][0] << "\t"
246 >                     << entry_plug->Hmat[1][0] << "\t"
247 >                     << entry_plug->Hmat[2][0] << ";\t"
248 >              
249 >               << entry_plug->Hmat[0][1] << "\t"
250 >                     << entry_plug->Hmat[1][1] << "\t"
251 >                     << entry_plug->Hmat[2][1] << ";\t"
252  
253 <          << entry_plug->Hmat[0][2] << "\t"
254 <          << entry_plug->Hmat[1][2] << "\t"
255 <          << entry_plug->Hmat[2][2] << ";\n";
256 <    
253 >                     << entry_plug->Hmat[0][2] << "\t"
254 >                     << entry_plug->Hmat[1][2] << "\t"
255 >                     << entry_plug->Hmat[2][2] << ";";
256 >
257 >    //write out additional parameters, such as chi and eta
258 >    *outFile[k] << entry_plug->the_integrator->getAdditionalParameters() << endl;
259 >  }
260 >  
261    for( i=0; i<nAtoms; i++ ){
262 <      
262 >
263      atoms[i]->getPos(pos);
264      atoms[i]->getVel(vel);
265  
# Line 123 | Line 275 | void DumpWriter::writeDump( double currentTime ){
275      strcpy( writeLine, tempBuffer );
276  
277      if( atoms[i]->isDirectional() ){
278 <        
278 >
279        dAtom = (DirectionalAtom *)atoms[i];
280        dAtom->getQ( q );
281 <        
281 >
282        sprintf( tempBuffer,
283                 "%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\n",
284                 q[0],
# Line 140 | Line 292 | void DumpWriter::writeDump( double currentTime ){
292      }
293      else
294        strcat( writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n" );
295 <      
296 <    outFile << writeLine;
295 >
296 >    for(k = 0; k < outFile.size(); k++)
297 >      *outFile[k] << writeLine;
298    }
146 –  outFile.flush();
299  
300   #else // is_mpi
301  
302 <  // first thing first, suspend fatalities.
303 <  painCave.isEventLoop = 1;
302 >  /* code to find maximum tag value */
303 >  
304 >  int *tagub, flag, MAXTAG;
305 >  MPI_Attr_get(MPI_COMM_WORLD, MPI_TAG_UB, &tagub, &flag);
306 >  if (flag) {
307 >    MAXTAG = *tagub;
308 >  } else {
309 >    MAXTAG = 32767;
310 >  }  
311  
153 –  int myStatus; // 1 = wakeup & success; 0 = error; -1 = AllDone
312    int haveError;
313  
314    MPI_Status istatus;
315    int *AtomToProcMap = mpiSim->getAtomToProcMap();
316 <  
316 >
317    // write out header and node 0's coordinates
318 <  
318 >
319    if( worldRank == 0 ){
320 <    outFile << mpiSim->getTotAtoms() << "\n";
321 <  
322 <    outFile << currentTime << ";\t"
323 <            << entry_plug->Hmat[0][0] << "\t"
324 <            << entry_plug->Hmat[1][0] << "\t"
325 <            << entry_plug->Hmat[2][0] << ";\t"
326 <      
327 <            << entry_plug->Hmat[0][1] << "\t"
328 <            << entry_plug->Hmat[1][1] << "\t"
171 <            << entry_plug->Hmat[2][1] << ";\t"
172 <      
173 <            << entry_plug->Hmat[0][2] << "\t"
174 <            << entry_plug->Hmat[1][2] << "\t"
175 <            << entry_plug->Hmat[2][2] << ";\n";
320 >
321 >    // Node 0 needs a list of the magic potatoes for each processor;
322 >
323 >    nProc = mpiSim->getNumberProcessors();
324 >    potatoes = new int[nProc];
325 >
326 >    //write out the comment lines
327 >    for (i = 0; i < nProc; i++)
328 >      potatoes[i] = 0;
329      
330 <    outFile.flush();
330 >      for(k = 0; k < outFile.size(); k++){
331 >        *outFile[k] << mpiSim->getTotAtoms() << "\n";
332 >
333 >        *outFile[k] << currentTime << ";\t"
334 >                         << entry_plug->Hmat[0][0] << "\t"
335 >                         << entry_plug->Hmat[1][0] << "\t"
336 >                         << entry_plug->Hmat[2][0] << ";\t"
337 >
338 >                         << entry_plug->Hmat[0][1] << "\t"
339 >                         << entry_plug->Hmat[1][1] << "\t"
340 >                         << entry_plug->Hmat[2][1] << ";\t"
341 >
342 >                         << entry_plug->Hmat[0][2] << "\t"
343 >                         << entry_plug->Hmat[1][2] << "\t"
344 >                         << entry_plug->Hmat[2][2] << ";";
345 >  
346 >        *outFile[k] << entry_plug->the_integrator->getAdditionalParameters() << endl;
347 >    }
348 >
349 >    currentIndex = 0;
350 >
351      for (i = 0 ; i < mpiSim->getTotAtoms(); i++ ) {
352 +      
353        // Get the Node number which has this atom;
354        
355 <      which_node = AtomToProcMap[i];    
355 >      which_node = AtomToProcMap[i];
356        
357 <      if (which_node == 0 ) {
357 >      if (which_node != 0) {
358 >
359 >        if (potatoes[which_node] + 3 >= MAXTAG) {
360 >          // The potato was going to exceed the maximum value,
361 >          // so wrap this processor potato back to 0:        
362 >
363 >          potatoes[which_node] = 0;          
364 >          MPI_Send(0, 1, MPI_INT, which_node, 0, MPI_COMM_WORLD);
365 >          
366 >        }
367 >
368 >        myPotato = potatoes[which_node];        
369 >        
370 >        MPI_Recv(MPIatomTypeString, MINIBUFFERSIZE, MPI_CHAR, which_node,
371 >                 myPotato, MPI_COMM_WORLD, &istatus);
372 >        
373 >        atomTypeString = MPIatomTypeString;
374          
375 <        haveError = 0;
376 <        which_atom = i;
377 <        local_index=-1;        
378 <        for (j=0; (j<mpiSim->getMyNlocal()) && (local_index < 0); j++) {
379 <          if (atoms[j]->getGlobalIndex() == which_atom) local_index = j;
375 >        myPotato++;
376 >
377 >        MPI_Recv(&isDirectional, 1, MPI_INT, which_node,
378 >                 myPotato, MPI_COMM_WORLD, &istatus);
379 >              
380 >        myPotato++;
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);          
388          }
389 <        if (local_index != -1) {
390 <          //format the line
389 >        
390 >        myPotato++;
391 >        potatoes[which_node] = myPotato;
392 >
393 >      } else {
394 >        
395 >        haveError = 0;
396 >        which_atom = i;
397 >        
398 >        //local_index = -1;
399 >
400 >        //for (j=0; (j<mpiSim->getMyNlocal()) && (local_index < 0); j++) {
401 >        //  if (atoms[j]->getGlobalIndex() == which_atom) local_index = j;
402 >        //}
403 >        
404 >        //if (local_index != -1) {
405            
406 +          local_index = indexArray[currentIndex].first;        
407 +          
408 +          if (which_atom == indexArray[currentIndex].second) {
409 +            
410 +            atomTypeString = atoms[local_index]->getType();
411 +            
412            atoms[local_index]->getPos(pos);
413 <          atoms[local_index]->getVel(vel);
196 <
197 <          sprintf( tempBuffer,
198 <                   "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t",
199 <                   atoms[local_index]->getType(),
200 <                   pos[0],
201 <                   pos[1],
202 <                   pos[2],
203 <                   vel[0],
204 <                   vel[1],
205 <                   vel[2]); // check here.
206 <          strcpy( writeLine, tempBuffer );
413 >          atoms[local_index]->getVel(vel);          
414            
415 +          atomData6[0] = pos[0];
416 +          atomData6[1] = pos[1];
417 +          atomData6[2] = pos[2];
418 +
419 +          atomData6[3] = vel[0];
420 +          atomData6[4] = vel[1];
421 +          atomData6[5] = vel[2];
422 +          
423 +          isDirectional = 0;
424 +
425            if( atoms[local_index]->isDirectional() ){
426 +
427 +            isDirectional = 1;
428              
429              dAtom = (DirectionalAtom *)atoms[local_index];
430              dAtom->getQ( q );
431 +
432 +            for (int j = 0; j < 6 ; j++)
433 +              atomData13[j] = atomData6[j];            
434              
435 <            sprintf( tempBuffer,
436 <                     "%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\n",
437 <                     q[0],
438 <                     q[1],
439 <                     q[2],
440 <                     q[3],
441 <                     dAtom->getJx(),
442 <                     dAtom->getJy(),
443 <                     dAtom->getJz());
444 <            strcat( writeLine, tempBuffer );
445 <            
224 <          }
225 <          else
226 <            strcat( writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n" );      
227 <        }
228 <        else {
435 >            atomData13[6] = q[0];
436 >            atomData13[7] = q[1];
437 >            atomData13[8] = q[2];
438 >            atomData13[9] = q[3];
439 >            
440 >            atomData13[10] = dAtom->getJx();
441 >            atomData13[11] = dAtom->getJy();
442 >            atomData13[12] = dAtom->getJz();
443 >          }
444 >          
445 >        } else {
446            sprintf(painCave.errMsg,
447 <                  "Atom %d not found on processor %d\n",
448 <                  i, worldRank );
447 >                  "Atom %d not found on processor %d, currentIndex = %d, local_index = %d\n",
448 >                  which_atom, worldRank, currentIndex, local_index );
449            haveError= 1;
450            simError();
451 <        }
452 <        
453 <        if(haveError) nodeZeroError();
454 <
451 >        }
452 >        
453 >        if(haveError) DieDieDie();
454 >        
455 >        currentIndex++;
456        }
457 <      else {
458 <        myStatus = 1;
459 <        MPI_Send(&myStatus, 1, MPI_INT, which_node,
242 <                 TAKE_THIS_TAG_INT, MPI_COMM_WORLD);
243 <        MPI_Send(&i, 1, MPI_INT, which_node, TAKE_THIS_TAG_INT,
244 <                 MPI_COMM_WORLD);
245 <        MPI_Recv(writeLine, BUFFERSIZE, MPI_CHAR, which_node,
246 <                 TAKE_THIS_TAG_CHAR, MPI_COMM_WORLD, &istatus);
247 <        MPI_Recv(&myStatus, 1, MPI_INT, which_node,
248 <                 TAKE_THIS_TAG_INT, MPI_COMM_WORLD, &istatus);
457 >      // If we've survived to here, format the line:
458 >      
459 >      if (!isDirectional) {
460          
461 <        if(!myStatus) nodeZeroError();
462 <
461 >        sprintf( writeLine,
462 >                 "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t",
463 >                 atomTypeString,
464 >                 atomData6[0],
465 >                 atomData6[1],
466 >                 atomData6[2],
467 >                 atomData6[3],
468 >                 atomData6[4],
469 >                 atomData6[5]);
470 >        
471 >        strcat( writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n" );
472 >        
473 >      } else {
474 >        
475 >        sprintf( writeLine,
476 >                 "%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",
477 >                 atomTypeString,
478 >                 atomData13[0],
479 >                 atomData13[1],
480 >                 atomData13[2],
481 >                 atomData13[3],
482 >                 atomData13[4],
483 >                 atomData13[5],
484 >                 atomData13[6],
485 >                 atomData13[7],
486 >                 atomData13[8],
487 >                 atomData13[9],
488 >                 atomData13[10],
489 >                 atomData13[11],
490 >                 atomData13[12]);
491 >        
492        }
493        
494 <      outFile << writeLine;
495 <      outFile.flush();
494 >      for(k = 0; k < outFile.size(); k++)
495 >        *outFile[k] << writeLine;
496      }
497      
498 <    // kill everyone off:
499 <    myStatus = -1;
260 <    for (j = 0; j < mpiSim->getNumberProcessors(); j++) {      
261 <      MPI_Send(&myStatus, 1, MPI_INT, j,
262 <               TAKE_THIS_TAG_INT, MPI_COMM_WORLD);
263 <    }
264 <
265 <  } else {
498 >    for(k = 0; k < outFile.size(); k++)
499 >      outFile[k]->flush();
500      
501 <    done = 0;
502 <    while (!done) {
503 <      
504 <      MPI_Recv(&myStatus, 1, MPI_INT, 0,
505 <               TAKE_THIS_TAG_INT, MPI_COMM_WORLD, &istatus);
501 >    sprintf( checkPointMsg,
502 >             "Sucessfully took a dump.\n");
503 >    
504 >    MPIcheckPoint();        
505 >    
506 >    delete[] potatoes;
507 >    
508 >  } else {
509  
510 <      if(!myStatus) anonymousNodeDie();
274 <      
275 <      if(myStatus < 0) break;
510 >    // worldRank != 0, so I'm a remote node.  
511  
512 <      MPI_Recv(&which_atom, 1, MPI_INT, 0,
513 <               TAKE_THIS_TAG_INT, MPI_COMM_WORLD, &istatus);
512 >    // Set my magic potato to 0:
513 >
514 >    myPotato = 0;
515 >    currentIndex = 0;
516 >    
517 >    for (i = 0 ; i < mpiSim->getTotAtoms(); i++ ) {
518        
519 <      myStatus = 1;
520 <      local_index=-1;        
521 <      for (j=0; (j<mpiSim->getMyNlocal()) && (local_index < 0); j++) {
283 <        if (atoms[j]->getGlobalIndex() == which_atom) local_index = j;
284 <      }
285 <      if (local_index != -1) {
286 <        //format the line
519 >      // Am I the node which has this atom?
520 >      
521 >      if (AtomToProcMap[i] == worldRank) {
522  
523 <        atoms[local_index]->getPos(pos);
289 <        atoms[local_index]->getVel(vel);
290 <
291 <        sprintf( tempBuffer,
292 <                 "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t",
293 <                 atoms[local_index]->getType(),
294 <                 pos[0],
295 <                 pos[1],
296 <                 pos[2],
297 <                 vel[0],
298 <                 vel[1],
299 <                 vel[2]); // check here.
300 <        strcpy( writeLine, tempBuffer );
301 <        
302 <        if( atoms[local_index]->isDirectional() ){
523 >        if (myPotato + 3 >= MAXTAG) {
524            
525 <          dAtom = (DirectionalAtom *)atoms[local_index];
526 <          dAtom->getQ( q );
525 >          // The potato was going to exceed the maximum value,
526 >          // so wrap this processor potato back to 0 (and block until
527 >          // node 0 says we can go:
528            
529 <          sprintf( tempBuffer,
530 <                   "%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\n",
531 <                   q[0],
532 <                   q[1],
311 <                   q[2],
312 <                   q[3],
313 <                   dAtom->getJx(),
314 <                   dAtom->getJy(),
315 <                   dAtom->getJz());
316 <          strcat( writeLine, tempBuffer );
317 <        }
318 <        else{
319 <          strcat( writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n" );
320 <        }
321 <      }
322 <      else {
323 <        sprintf(painCave.errMsg,
324 <                "Atom %d not found on processor %d\n",
325 <                which_atom, worldRank );
326 <        myStatus = 0;
327 <        simError();
529 >          MPI_Recv(&myPotato, 1, MPI_INT, 0, 0, MPI_COMM_WORLD, &istatus);
530 >          
531 >        }
532 >        which_atom = i;
533  
534 <        strcpy( writeLine, "Hello, I'm an error.\n");
330 <      }
534 >        //local_index = -1;
535  
536 <      MPI_Send(writeLine, BUFFERSIZE, MPI_CHAR, 0,
537 <               TAKE_THIS_TAG_CHAR, MPI_COMM_WORLD);
538 <      MPI_Send( &myStatus, 1, MPI_INT, 0,
539 <                TAKE_THIS_TAG_INT, MPI_COMM_WORLD);
540 <    }
337 <  }  
338 <  outFile.flush();
339 <  sprintf( checkPointMsg,
340 <           "Sucessfully took a dump.\n");
341 <  MPIcheckPoint();
536 >        //for (j=0; (j<mpiSim->getMyNlocal()) && (local_index < 0); j++) {
537 >        // if (atoms[j]->getGlobalIndex() == which_atom) local_index = j;
538 >        //}
539 >        
540 >        //if (local_index != -1) {
541  
542 < // last  thing last, enable  fatalities.
543 <  painCave.isEventLoop = 0;
542 >        local_index = indexArray[currentIndex].first;        
543 >                
544 >        if (which_atom == indexArray[currentIndex].second) {
545 >        
546 >          atomTypeString = atoms[local_index]->getType();
547 >          
548 >          atoms[local_index]->getPos(pos);
549 >          atoms[local_index]->getVel(vel);
550 >          
551 >          atomData6[0] = pos[0];
552 >          atomData6[1] = pos[1];
553 >          atomData6[2] = pos[2];
554  
555 < #endif // is_mpi
556 < }
555 >          atomData6[3] = vel[0];
556 >          atomData6[4] = vel[1];
557 >          atomData6[5] = vel[2];
558 >          
559 >          isDirectional = 0;
560  
561 < void DumpWriter::writeFinal(double finalTime){
561 >          if( atoms[local_index]->isDirectional() ){
562  
563 <  char finalName[500];
564 <  ofstream finalOut;
563 >            isDirectional = 1;
564 >            
565 >            dAtom = (DirectionalAtom *)atoms[local_index];
566 >            dAtom->getQ( q );
567 >            
568 >            for (int j = 0; j < 6 ; j++)
569 >              atomData13[j] = atomData6[j];
570 >            
571 >            atomData13[6] = q[0];
572 >            atomData13[7] = q[1];
573 >            atomData13[8] = q[2];
574 >            atomData13[9] = q[3];
575 >  
576 >            atomData13[10] = dAtom->getJx();
577 >            atomData13[11] = dAtom->getJy();
578 >            atomData13[12] = dAtom->getJz();
579 >          }
580  
581 <  const int BUFFERSIZE = 2000;
582 <  char tempBuffer[BUFFERSIZE];
583 <  char writeLine[BUFFERSIZE];  
581 >        } else {
582 >          sprintf(painCave.errMsg,
583 >                  "Atom %d not found on processor %d, currentIndex = %d, local_index = %d\n",
584 >                  which_atom, worldRank, currentIndex, local_index );
585 >          haveError= 1;
586 >          simError();
587 >        }
588 >        
589 >        strncpy(MPIatomTypeString, atomTypeString, MINIBUFFERSIZE);
590  
591 <  double q[4];
592 <  DirectionalAtom* dAtom;
360 <  Atom** atoms = entry_plug->atoms;
361 <  int i;
362 < #ifdef IS_MPI
363 <  int j, which_node, done, which_atom, local_index;
364 < #else //is_mpi
365 <  int nAtoms = entry_plug->n_atoms;
366 < #endif //is_mpi
367 <  
368 <  double pos[3], vel[3];
369 <  
370 < #ifdef IS_MPI
371 <  if(worldRank == 0 ){
372 < #endif // is_mpi
373 <    
374 <    strcpy( finalName, entry_plug->finalName );
375 <    
376 <    finalOut.open( finalName, ios::out | ios::trunc );
377 <    if( !finalOut ){
378 <      sprintf( painCave.errMsg,
379 <               "Could not open \"%s\" for final dump output.\n",
380 <               finalName );
381 <      painCave.isFatal = 1;
382 <      simError();
383 <    }
384 <    
385 <    // finalOut.setf( ios::scientific );
386 <    
387 < #ifdef IS_MPI
388 <  }
389 <  
390 <  sprintf(checkPointMsg,"Opened file for final configuration\n");
391 <  MPIcheckPoint();  
392 <  
393 < #endif //is_mpi
591 >        // null terminate the string before sending (just in case):
592 >        MPIatomTypeString[MINIBUFFERSIZE-1] = '\0';
593  
594 <  
595 < #ifndef IS_MPI
596 <    
597 <  finalOut << nAtoms << "\n";
399 <    
400 <  finalOut << finalTime << ";\t"
401 <           << entry_plug->Hmat[0][0] << "\t"
402 <           << entry_plug->Hmat[1][0] << "\t"
403 <           << entry_plug->Hmat[2][0] << ";\t"
404 <    
405 <           << entry_plug->Hmat[0][1] << "\t"
406 <           << entry_plug->Hmat[1][1] << "\t"
407 <           << entry_plug->Hmat[2][1] << ";\t"
408 <    
409 <           << entry_plug->Hmat[0][2] << "\t"
410 <           << entry_plug->Hmat[1][2] << "\t"
411 <           << entry_plug->Hmat[2][2] << ";\n";
412 <  
413 <  for( i=0; i<nAtoms; i++ ){
414 <      
415 <    atoms[i]->getPos(pos);
416 <    atoms[i]->getVel(vel);
417 <    
418 <    sprintf( tempBuffer,
419 <             "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t",
420 <             atoms[i]->getType(),
421 <             pos[0],
422 <             pos[1],
423 <             pos[2],
424 <             vel[0],
425 <             vel[1],
426 <             vel[2]);
427 <    strcpy( writeLine, tempBuffer );
594 >        MPI_Send(MPIatomTypeString, MINIBUFFERSIZE, MPI_CHAR, 0,
595 >                             myPotato, MPI_COMM_WORLD);
596 >        
597 >        myPotato++;
598  
599 <    if( atoms[i]->isDirectional() ){
600 <        
601 <      dAtom = (DirectionalAtom *)atoms[i];
602 <      dAtom->getQ( q );
603 <        
604 <      sprintf( tempBuffer,
605 <               "%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\n",
606 <               q[0],
607 <               q[1],
608 <               q[2],
609 <               q[3],
610 <               dAtom->getJx(),
611 <               dAtom->getJy(),
612 <               dAtom->getJz());
443 <      strcat( writeLine, tempBuffer );
444 <    }
445 <    else
446 <      strcat( writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n" );
447 <      
448 <    finalOut << writeLine;
449 <  }
450 <  finalOut.flush();
451 <  finalOut.close();
452 <
453 < #else // is_mpi
454 <  
455 <  // first thing first, suspend fatalities.
456 <  painCave.isEventLoop = 1;
457 <
458 <  int myStatus; // 1 = wakeup & success; 0 = error; -1 = AllDone
459 <  int haveError;
460 <
461 <  MPI_Status istatus;
462 <  int *AtomToProcMap = mpiSim->getAtomToProcMap();
463 <
464 <  // write out header and node 0's coordinates
465 <  
466 <  haveError = 0;
467 <  if( worldRank == 0 ){
468 <    finalOut << mpiSim->getTotAtoms() << "\n";
469 <    
470 <    finalOut << finalTime << ";\t"
471 <             << entry_plug->Hmat[0][0] << "\t"
472 <             << entry_plug->Hmat[1][0] << "\t"
473 <             << entry_plug->Hmat[2][0] << ";\t"
474 <      
475 <             << entry_plug->Hmat[0][1] << "\t"
476 <             << entry_plug->Hmat[1][1] << "\t"
477 <             << entry_plug->Hmat[2][1] << ";\t"
478 <      
479 <             << entry_plug->Hmat[0][2] << "\t"
480 <             << entry_plug->Hmat[1][2] << "\t"
481 <             << entry_plug->Hmat[2][2] << ";\n";
482 <    
483 <    for (i = 0 ; i < mpiSim->getTotAtoms(); i++ ) {
484 <      // Get the Node number which has this molecule:
485 <      
486 <      which_node = AtomToProcMap[i];    
487 <      
488 <      if (which_node == mpiSim->getMyNode()) {
489 <
490 <        which_atom = i;
491 <        local_index=-1;        
492 <        for (j=0; (j<mpiSim->getMyNlocal()) && (local_index < 0); j++) {
493 <          if (atoms[j]->getGlobalIndex() == which_atom) local_index = j;
599 >        MPI_Send(&isDirectional, 1, MPI_INT, 0,
600 >                             myPotato, MPI_COMM_WORLD);
601 >        
602 >        myPotato++;
603 >        
604 >        if (isDirectional) {
605 >
606 >          MPI_Send(atomData13, 13, MPI_DOUBLE, 0,
607 >                   myPotato, MPI_COMM_WORLD);
608 >          
609 >        } else {
610 >
611 >          MPI_Send(atomData6, 6, MPI_DOUBLE, 0,
612 >                   myPotato, MPI_COMM_WORLD);
613          }
495 –        if (local_index != -1) {    
614  
615 <          atoms[local_index]->getPos(pos);
616 <          atoms[local_index]->getVel(vel);
499 <          
500 <          sprintf( tempBuffer,
501 <                   "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t",
502 <                   atoms[local_index]->getType(),
503 <                   pos[0],
504 <                   pos[1],
505 <                   pos[2],
506 <                   vel[0],
507 <                   vel[1],
508 <                   vel[2]);
509 <          strcpy( writeLine, tempBuffer );
510 <          
511 <          if( atoms[local_index]->isDirectional() ){
512 <            
513 <            dAtom = (DirectionalAtom *)atoms[local_index];
514 <            dAtom->getQ( q );
515 <            
516 <            sprintf( tempBuffer,
517 <                     "%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\n",
518 <                     q[0],
519 <                     q[1],
520 <                     q[2],
521 <                     q[3],
522 <                     dAtom->getJx(),
523 <                     dAtom->getJy(),
524 <                     dAtom->getJz());
525 <            strcat( writeLine, tempBuffer );
526 <          }
527 <          else
528 <            strcat( writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n" );      
529 <        }
530 <        else {
531 <          sprintf(painCave.errMsg,
532 <                  "Atom %d not found on processor %d\n",
533 <                  i, worldRank );
534 <          haveError= 1;
535 <          simError();
536 <        }
537 <
538 <        if(haveError) nodeZeroError();
539 <    
540 <      }
541 <      else {
542 <        
543 <        myStatus = 1;
544 <        MPI_Send(&myStatus, 1, MPI_INT, which_node,
545 <                 TAKE_THIS_TAG_INT, MPI_COMM_WORLD);
546 <        MPI_Send(&i, 1, MPI_INT, which_node, TAKE_THIS_TAG_INT,
547 <                 MPI_COMM_WORLD);
548 <        MPI_Recv(writeLine, BUFFERSIZE, MPI_CHAR, which_node,
549 <                 TAKE_THIS_TAG_CHAR, MPI_COMM_WORLD, &istatus);
550 <        MPI_Recv(&myStatus, 1, MPI_INT, which_node,
551 <                 TAKE_THIS_TAG_INT, MPI_COMM_WORLD, &istatus);
552 <        
553 <        if(!myStatus) nodeZeroError();
615 >        myPotato++;  
616 >        currentIndex++;    
617        }
555 –      
556 –      finalOut << writeLine;
618      }
558 –    
559 –    // kill everyone off:
560 –    myStatus = -1;
561 –    for (j = 0; j < mpiSim->getNumberProcessors(); j++) {      
562 –      MPI_Send(&myStatus, 1, MPI_INT, j,
563 –               TAKE_THIS_TAG_INT, MPI_COMM_WORLD);
564 –    }
619  
620 <  } else {
620 >    sprintf( checkPointMsg,
621 >             "Sucessfully took a dump.\n");
622 >    MPIcheckPoint();        
623      
624 <    done = 0;
569 <    while (!done) {
570 <
571 <      MPI_Recv(&myStatus, 1, MPI_INT, 0,
572 <               TAKE_THIS_TAG_INT, MPI_COMM_WORLD, &istatus);
573 <      
574 <      if(!myStatus) anonymousNodeDie();
575 <      
576 <      if(myStatus < 0) break;
577 <      
578 <      MPI_Recv(&which_atom, 1, MPI_INT, 0,
579 <               TAKE_THIS_TAG_INT, MPI_COMM_WORLD, &istatus);
580 <      
581 <      myStatus = 1;
582 <      local_index=-1;        
583 <      for (j=0; j < mpiSim->getMyNlocal(); j++) {
584 <        if (atoms[j]->getGlobalIndex() == which_atom) local_index = j;
585 <      }
586 <      if (local_index != -1) {
587 <
588 <        atoms[local_index]->getPos(pos);
589 <        atoms[local_index]->getVel(vel);
590 <
591 <        //format the line
592 <        sprintf( tempBuffer,
593 <                 "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t",
594 <                 atoms[local_index]->getType(),
595 <                 pos[0],
596 <                 pos[1],
597 <                 pos[2],
598 <                 vel[0],
599 <                 vel[1],
600 <                 vel[2]); // check here.
601 <        strcpy( writeLine, tempBuffer );
602 <        
603 <        if( atoms[local_index]->isDirectional() ){
604 <          
605 <          dAtom = (DirectionalAtom *)atoms[local_index];
606 <          dAtom->getQ( q );
607 <          
608 <          sprintf( tempBuffer,
609 <                   "%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\n",
610 <                   q[0],
611 <                   q[1],
612 <                   q[2],
613 <                   q[3],
614 <                   dAtom->getJx(),
615 <                   dAtom->getJy(),
616 <                   dAtom->getJz());
617 <          strcat( writeLine, tempBuffer );
618 <        }
619 <        else{
620 <          strcat( writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n" );
621 <        }
622 <      }
623 <      else {
624 <        sprintf(painCave.errMsg,
625 <                "Atom %d not found on processor %d\n",
626 <                which_atom, worldRank );
627 <        myStatus = 0;
628 <        simError();
629 <        
630 <        strcpy( writeLine, "Hello, I'm an error.\n");
631 <      }
632 <
633 <      MPI_Send(writeLine, BUFFERSIZE, MPI_CHAR, 0,
634 <               TAKE_THIS_TAG_CHAR, MPI_COMM_WORLD);
635 <      MPI_Send( &myStatus, 1, MPI_INT, 0,
636 <                TAKE_THIS_TAG_INT, MPI_COMM_WORLD);
637 <    }
638 <  }
639 <  finalOut.flush();
640 <  sprintf( checkPointMsg,
641 <           "Sucessfully took a dump.\n");
642 <  MPIcheckPoint();
624 >  }
625    
644 –  if( worldRank == 0 ) finalOut.close();    
626   #endif // is_mpi
627   }
628  
648 –
649 –
629   #ifdef IS_MPI
630  
631   // a couple of functions to let us escape the write loop
632  
633 < void dWrite::nodeZeroError( void ){
655 <  int j, myStatus;
656 <  
657 <  myStatus = 0;
658 <  for (j = 0; j < mpiSim->getNumberProcessors(); j++) {      
659 <    MPI_Send( &myStatus, 1, MPI_INT, j,
660 <              TAKE_THIS_TAG_INT, MPI_COMM_WORLD);
661 <  }  
662 <  
633 > void dWrite::DieDieDie( void ){
634  
635    MPI_Finalize();
636    exit (0);
666 –  
637   }
638  
669 – void dWrite::anonymousNodeDie( void ){
670 –
671 –  MPI_Finalize();
672 –  exit (0);
673 – }
674 –
639   #endif //is_mpi

Diff Legend

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