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

Diff Legend

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