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 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 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 +  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 83 | Line 234 | void DumpWriter::writeDump( double currentTime ){
234    DirectionalAtom* dAtom;
235    Atom** atoms = entry_plug->atoms;
236    double pos[3], vel[3];
86    
87  
88  // write current frame to the eor file
237  
90  this->writeFinal( currentTime );
91
238   #ifndef IS_MPI
239 <    
240 <  outFile << nAtoms << "\n";
241 <    
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"
239 >  
240 >  for(k = 0; k < outFile.size(); k++){
241 >    *outFile[k] << nAtoms << "\n";
242  
243 <          << entry_plug->Hmat[0][1] << "\t"
244 <          << entry_plug->Hmat[1][1] << "\t"
245 <          << entry_plug->Hmat[2][1] << ";\t"
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 <          << entry_plug->Hmat[0][2] << "\t"
253 <          << entry_plug->Hmat[1][2] << "\t"
254 <          << entry_plug->Hmat[2][2] << ";\n";
255 <    
252 >                     << entry_plug->Hmat[0][2] << "\t"
253 >                     << entry_plug->Hmat[1][2] << "\t"
254 >                     << entry_plug->Hmat[2][2] << ";";
255 >
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 <      
261 >
262      atoms[i]->getPos(pos);
263      atoms[i]->getVel(vel);
264  
# Line 123 | Line 274 | void DumpWriter::writeDump( double currentTime ){
274      strcpy( writeLine, tempBuffer );
275  
276      if( atoms[i]->isDirectional() ){
277 <        
277 >
278        dAtom = (DirectionalAtom *)atoms[i];
279        dAtom->getQ( q );
280 <        
280 >
281        sprintf( tempBuffer,
282                 "%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\n",
283                 q[0],
# Line 140 | Line 291 | void DumpWriter::writeDump( double currentTime ){
291      }
292      else
293        strcat( writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n" );
294 <      
295 <    outFile << writeLine;
294 >
295 >    for(k = 0; k < outFile.size(); k++)
296 >      *outFile[k] << writeLine;
297    }
146  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  
153  int myStatus; // 1 = wakeup & success; 0 = error; -1 = AllDone
311    int haveError;
312  
313    MPI_Status istatus;
314    int *AtomToProcMap = mpiSim->getAtomToProcMap();
315 <  
315 >
316    // write out header and node 0's coordinates
317 <  
317 >
318    if( worldRank == 0 ){
319 <    outFile << mpiSim->getTotAtoms() << "\n";
320 <  
321 <    outFile << currentTime << ";\t"
322 <            << entry_plug->Hmat[0][0] << "\t"
323 <            << entry_plug->Hmat[1][0] << "\t"
324 <            << entry_plug->Hmat[2][0] << ";\t"
325 <      
326 <            << entry_plug->Hmat[0][1] << "\t"
327 <            << 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";
319 >
320 >    // Node 0 needs a list of the magic potatoes for each processor;
321 >
322 >    nProc = mpiSim->getNumberProcessors();
323 >    potatoes = new int[nProc];
324 >
325 >    //write out the comment lines
326 >    for (i = 0; i < nProc; i++)
327 >      potatoes[i] = 0;
328      
329 <    outFile.flush();
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        
354 <      which_node = AtomToProcMap[i];    
354 >      which_node = AtomToProcMap[i];
355        
356 <      if (which_node == 0 ) {
356 >      if (which_node != 0) {
357 >
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 >          potatoes[which_node] = 0;          
363 >          MPI_Send(0, 1, MPI_INT, which_node, 0, MPI_COMM_WORLD);
364 >          
365 >        }
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 <        haveError = 0;
375 <        which_atom = i;
376 <        local_index=-1;        
377 <        for (j=0; (j<mpiSim->getMyNlocal()) && (local_index < 0); j++) {
378 <          if (atoms[j]->getGlobalIndex() == which_atom) local_index = j;
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 <        if (local_index != -1) {
389 <          //format the line
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);
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 );
412 >          atoms[local_index]->getVel(vel);          
413            
414 +          atomData6[0] = pos[0];
415 +          atomData6[1] = pos[1];
416 +          atomData6[2] = pos[2];
417 +
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 +            for (int j = 0; j < 6 ; j++)
432 +              atomData13[j] = atomData6[j];            
433              
434 <            sprintf( tempBuffer,
435 <                     "%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\n",
436 <                     q[0],
437 <                     q[1],
438 <                     q[2],
439 <                     q[3],
440 <                     dAtom->getJx(),
441 <                     dAtom->getJy(),
442 <                     dAtom->getJz());
443 <            strcat( writeLine, tempBuffer );
444 <            
224 <          }
225 <          else
226 <            strcat( writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n" );      
227 <        }
228 <        else {
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 <
450 >        }
451 >        
452 >        if(haveError) DieDieDie();
453 >        
454 >        currentIndex++;
455        }
456 <      else {
457 <        myStatus = 1;
458 <        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);
456 >      // If we've survived to here, format the line:
457 >      
458 >      if (!isDirectional) {
459          
460 <        if(!myStatus) nodeZeroError();
461 <
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();
493 >      for(k = 0; k < outFile.size(); k++)
494 >        *outFile[k] << writeLine;
495      }
496      
497 <    // kill everyone off:
498 <    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 {
497 >    for(k = 0; k < outFile.size(); k++)
498 >      outFile[k]->flush();
499      
500 <    done = 0;
501 <    while (!done) {
269 <      
270 <      MPI_Recv(&myStatus, 1, MPI_INT, 0,
271 <               TAKE_THIS_TAG_INT, MPI_COMM_WORLD, &istatus);
272 <
273 <      if(!myStatus) anonymousNodeDie();
274 <      
275 <      if(myStatus < 0) break;
276 <
277 <      MPI_Recv(&which_atom, 1, MPI_INT, 0,
278 <               TAKE_THIS_TAG_INT, MPI_COMM_WORLD, &istatus);
279 <      
280 <      myStatus = 1;
281 <      local_index=-1;        
282 <      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
287 <
288 <        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() ){
303 <          
304 <          dAtom = (DirectionalAtom *)atoms[local_index];
305 <          dAtom->getQ( q );
306 <          
307 <          sprintf( tempBuffer,
308 <                   "%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\n",
309 <                   q[0],
310 <                   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();
328 <
329 <        strcpy( writeLine, "Hello, I'm an error.\n");
330 <      }
331 <
332 <      MPI_Send(writeLine, BUFFERSIZE, MPI_CHAR, 0,
333 <               TAKE_THIS_TAG_CHAR, MPI_COMM_WORLD);
334 <      MPI_Send( &myStatus, 1, MPI_INT, 0,
335 <                TAKE_THIS_TAG_INT, MPI_COMM_WORLD);
336 <    }
337 <  }  
338 <  outFile.flush();
339 <  sprintf( checkPointMsg,
340 <           "Sucessfully took a dump.\n");
341 <  MPIcheckPoint();
342 <
343 < // last  thing last, enable  fatalities.
344 <  painCave.isEventLoop = 0;
345 <
346 < #endif // is_mpi
347 < }
348 <
349 < void DumpWriter::writeFinal(double finalTime){
350 <
351 <  char finalName[500];
352 <  ofstream finalOut;
353 <
354 <  const int BUFFERSIZE = 2000;
355 <  char tempBuffer[BUFFERSIZE];
356 <  char writeLine[BUFFERSIZE];  
357 <
358 <  double q[4];
359 <  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
500 >    sprintf( checkPointMsg,
501 >             "Sucessfully took a dump.\n");
502      
503 <    strcpy( finalName, entry_plug->finalName );
503 >    MPIcheckPoint();        
504      
505 <    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 <    }
505 >    delete[] potatoes;
506      
507 <    // 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
507 >  } else {
508  
509 <  
396 < #ifndef IS_MPI
397 <    
398 <  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 );
509 >    // worldRank != 0, so I'm a remote node.  
510  
511 <    if( atoms[i]->isDirectional() ){
430 <        
431 <      dAtom = (DirectionalAtom *)atoms[i];
432 <      dAtom->getQ( q );
433 <        
434 <      sprintf( tempBuffer,
435 <               "%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\n",
436 <               q[0],
437 <               q[1],
438 <               q[2],
439 <               q[3],
440 <               dAtom->getJx(),
441 <               dAtom->getJy(),
442 <               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();
511 >    // Set my magic potato to 0:
512  
513 < #else // is_mpi
514 <  
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";
513 >    myPotato = 0;
514 >    currentIndex = 0;
515      
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    
516      for (i = 0 ; i < mpiSim->getTotAtoms(); i++ ) {
484      // Get the Node number which has this molecule:
517        
518 <      which_node = AtomToProcMap[i];    
518 >      // Am I the node which has this atom?
519        
520 <      if (which_node == mpiSim->getMyNode()) {
520 >      if (AtomToProcMap[i] == worldRank) {
521  
522 <        which_atom = i;
523 <        local_index=-1;        
524 <        for (j=0; (j<mpiSim->getMyNlocal()) && (local_index < 0); j++) {
525 <          if (atoms[j]->getGlobalIndex() == which_atom) local_index = j;
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 <        if (local_index != -1) {    
531 >        which_atom = i;
532  
533 +        //local_index = -1;
534 +
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 +        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 <          sprintf( tempBuffer,
551 <                   "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t",
552 <                   atoms[local_index]->getType(),
553 <                   pos[0],
554 <                   pos[1],
555 <                   pos[2],
556 <                   vel[0],
557 <                   vel[1],
558 <                   vel[2]);
559 <          strcpy( writeLine, tempBuffer );
560 <          
561 <          if( atoms[local_index]->isDirectional() ){
562 <            
563 <            dAtom = (DirectionalAtom *)atoms[local_index];
564 <            dAtom->getQ( q );
565 <            
566 <            sprintf( tempBuffer,
567 <                     "%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\n",
568 <                     q[0],
569 <                     q[1],
570 <                     q[2],
571 <                     q[3],
572 <                     dAtom->getJx(),
573 <                     dAtom->getJy(),
574 <                     dAtom->getJz());
575 <            strcat( writeLine, tempBuffer );
576 <          }
577 <          else
578 <            strcat( writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n" );      
579 <        }
580 <        else {
550 >          atomData6[0] = pos[0];
551 >          atomData6[1] = pos[1];
552 >          atomData6[2] = pos[2];
553 >
554 >          atomData6[3] = vel[0];
555 >          atomData6[4] = vel[1];
556 >          atomData6[5] = vel[2];
557 >          
558 >          isDirectional = 0;
559 >
560 >          if( atoms[local_index]->isDirectional() ){
561 >
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\n",
583 <                  i, worldRank );
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 <        }
586 >        }
587 >        
588 >        strncpy(MPIatomTypeString, atomTypeString, MINIBUFFERSIZE);
589  
590 <        if(haveError) nodeZeroError();
591 <    
592 <      }
593 <      else {
590 >        // null terminate the string before sending (just in case):
591 >        MPIatomTypeString[MINIBUFFERSIZE-1] = '\0';
592 >
593 >        MPI_Send(MPIatomTypeString, MINIBUFFERSIZE, MPI_CHAR, 0,
594 >                             myPotato, MPI_COMM_WORLD);
595          
596 <        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();
554 <      }
555 <      
556 <      finalOut << writeLine;
557 <    }
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 <    }
596 >        myPotato++;
597  
598 <  } else {
599 <    
600 <    done = 0;
601 <    while (!done) {
598 >        MPI_Send(&isDirectional, 1, MPI_INT, 0,
599 >                             myPotato, MPI_COMM_WORLD);
600 >        
601 >        myPotato++;
602 >        
603 >        if (isDirectional) {
604  
605 <      MPI_Recv(&myStatus, 1, MPI_INT, 0,
606 <               TAKE_THIS_TAG_INT, MPI_COMM_WORLD, &istatus);
607 <      
608 <      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) {
605 >          MPI_Send(atomData13, 13, MPI_DOUBLE, 0,
606 >                   myPotato, MPI_COMM_WORLD);
607 >          
608 >        } else {
609  
610 <        atoms[local_index]->getPos(pos);
611 <        atoms[local_index]->getVel(vel);
610 >          MPI_Send(atomData6, 6, MPI_DOUBLE, 0,
611 >                   myPotato, MPI_COMM_WORLD);
612 >        }
613  
614 <        //format the line
615 <        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");
614 >        myPotato++;  
615 >        currentIndex++;    
616        }
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);
617      }
618 <  }
619 <  finalOut.flush();
620 <  sprintf( checkPointMsg,
621 <           "Sucessfully took a dump.\n");
622 <  MPIcheckPoint();
618 >
619 >    sprintf( checkPointMsg,
620 >             "Sucessfully took a dump.\n");
621 >    MPIcheckPoint();        
622 >    
623 >  }
624    
644  if( worldRank == 0 ) finalOut.close();    
625   #endif // is_mpi
626   }
627  
648
649
628   #ifdef IS_MPI
629  
630   // a couple of functions to let us escape the write loop
631  
632 < 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 <  
632 > void dWrite::DieDieDie( void ){
633  
634    MPI_Finalize();
635    exit (0);
666  
636   }
637  
669 void dWrite::anonymousNodeDie( void ){
670
671  MPI_Finalize();
672  exit (0);
673 }
674
638   #endif //is_mpi

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines