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 916 by gezelter, Fri Jan 9 20:29:32 2004 UTC vs.
Revision 951 by mmeineke, Fri Jan 16 21:51:51 2004 UTC

# Line 3 | Line 3
3   #include <string.h>
4   #include <iostream>
5   #include <fstream>
6 + #include <algorithm>
7 + #include <utility>
8  
9   #ifdef IS_MPI
10   #include <mpi.h>
# Line 26 | Line 28 | DumpWriter::DumpWriter( SimInfo* the_entry_plug ){
28    if(worldRank == 0 ){
29   #endif // is_mpi
30  
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  
33 –    if( !outFile ){
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  
42 –    //outFile.setf( ios::scientific );
43 –
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 56 | 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 <  const int BUFFERSIZE = 2000;
70 <  const int MINIBUFFERSIZE = 100;
69 > /**
70 > * A hook function to load balancing
71 > */
72  
73 <  char tempBuffer[BUFFERSIZE];
74 <  char writeLine[BUFFERSIZE];
75 <
74 <  int i;
75 <
76 < #ifdef IS_MPI
73 > void DumpWriter::update(){
74 >  sortByGlobalIndex();          
75 > }
76    
77 <  int *potatoes;
78 <  int myPotato;
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 <  int nProc;
86 <  int j, which_node, done, which_atom, local_index;
87 <  double atomData6[6];
88 <  double atomData13[13];
89 <  int isDirectional;
86 <  char* atomTypeString;
87 <  char MPIatomTypeString[MINIBUFFERSIZE];
88 <
89 < #else //is_mpi
90 <  int nAtoms = entry_plug->n_atoms;
91 < #endif //is_mpi
92 <
93 <  double q[4];
94 <  DirectionalAtom* dAtom;
85 > /**
86 > * Sorting the local index by global index
87 > */
88 >
89 > void DumpWriter::sortByGlobalIndex(){
90    Atom** atoms = entry_plug->atoms;
91 <  double pos[3], vel[3];
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 <  // write current frame to the eor file
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 <  this->writeFinal( currentTime );
105 > #endif
106  
107 < #ifndef IS_MPI
107 > void DumpWriter::writeDump(double currentTime){
108  
109 <  outFile << nAtoms << "\n";
109 >  ofstream finalOut;
110 >  vector<ofstream*> fileStreams;
111  
112 <  outFile << currentTime << ";\t"
113 <          << entry_plug->Hmat[0][0] << "\t"
114 <          << entry_plug->Hmat[1][0] << "\t"
115 <          << entry_plug->Hmat[2][0] << ";\t"
116 <
117 <          << entry_plug->Hmat[0][1] << "\t"
118 <          << entry_plug->Hmat[1][1] << "\t"
119 <          << entry_plug->Hmat[2][1] << ";\t"
120 <
121 <          << entry_plug->Hmat[0][2] << "\t"
122 <          << entry_plug->Hmat[1][2] << "\t"
123 <          << entry_plug->Hmat[2][2] << ";";
118 <  //write out additional parameters, such as chi and eta
119 <  outFile << entry_plug->the_integrator->getAdditionalParameters();
120 <  outFile << endl;
121 <
122 <  for( i=0; i<nAtoms; i++ ){
123 <
124 <    atoms[i]->getPos(pos);
125 <    atoms[i]->getVel(vel);
126 <
127 <    sprintf( tempBuffer,
128 <             "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t",
129 <             atoms[i]->getType(),
130 <             pos[0],
131 <             pos[1],
132 <             pos[2],
133 <             vel[0],
134 <             vel[1],
135 <             vel[2]);
136 <    strcpy( writeLine, tempBuffer );
137 <
138 <    if( atoms[i]->isDirectional() ){
139 <
140 <      dAtom = (DirectionalAtom *)atoms[i];
141 <      dAtom->getQ( q );
142 <
143 <      sprintf( tempBuffer,
144 <               "%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\n",
145 <               q[0],
146 <               q[1],
147 <               q[2],
148 <               q[3],
149 <               dAtom->getJx(),
150 <               dAtom->getJy(),
151 <               dAtom->getJz());
152 <      strcat( writeLine, tempBuffer );
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      }
154 –    else
155 –      strcat( writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n" );
156 –
157 –    outFile << writeLine;
125    }
126 <  outFile.flush();
126 > #endif // is_mpi
127  
128 < #else // is_mpi
128 >  fileStreams.push_back(&finalOut);
129 >  fileStreams.push_back(&dumpFile);
130  
131 <  /* code to find maximum tag value */
164 <  int *tagub, flag, MAXTAG;
165 <  MPI_Attr_get(MPI_COMM_WORLD, MPI_TAG_UB, &tagub, &flag);
166 <  if (flag) {
167 <    MAXTAG = *tagub;
168 <  } else {
169 <    MAXTAG = 32767;
170 <  }  
131 >  writeFrame(fileStreams, currentTime);
132  
133 <  int haveError;
133 > #ifdef IS_MPI
134 >  finalOut.close();
135 > #endif
136 >        
137 > }
138  
139 <  MPI_Status istatus;
175 <  int *AtomToProcMap = mpiSim->getAtomToProcMap();
139 > void DumpWriter::writeFinal(double currentTime){
140  
141 <  // write out header and node 0's coordinates
141 >  ofstream finalOut;
142 >  vector<ofstream*> fileStreams;
143  
144 <  if( worldRank == 0 ){
144 > #ifdef IS_MPI
145 >  if(worldRank == 0 ){
146 > #endif // is_mpi
147  
148 <    // Node 0 needs a list of the magic potatoes for each processor;
148 >    finalOut.open( entry_plug->finalName, ios::out | ios::trunc );
149  
150 <    nProc = mpiSim->getNumberProcessors();
151 <    potatoes = new int[nProc];
152 <
153 <    for (i = 0; i < nProc; i++)
154 <      potatoes[i] = 0;
155 <    
189 <    outFile << mpiSim->getTotAtoms() << "\n";
190 <
191 <    outFile << currentTime << ";\t"
192 <            << entry_plug->Hmat[0][0] << "\t"
193 <            << entry_plug->Hmat[1][0] << "\t"
194 <            << entry_plug->Hmat[2][0] << ";\t"
195 <
196 <            << entry_plug->Hmat[0][1] << "\t"
197 <            << entry_plug->Hmat[1][1] << "\t"
198 <            << entry_plug->Hmat[2][1] << ";\t"
199 <
200 <            << entry_plug->Hmat[0][2] << "\t"
201 <            << entry_plug->Hmat[1][2] << "\t"
202 <            << entry_plug->Hmat[2][2] << ";";
203 <
204 <    outFile << entry_plug->the_integrator->getAdditionalParameters();
205 <    outFile << endl;
206 <    outFile.flush();
207 <
208 <    for (i = 0 ; i < mpiSim->getTotAtoms(); i++ ) {
209 <      
210 <      // Get the Node number which has this atom;
211 <      
212 <      which_node = AtomToProcMap[i];
213 <      
214 <      if (which_node != 0) {
215 <
216 <        if (potatoes[which_node] + 3 >= MAXTAG) {
217 <          // The potato was going to exceed the maximum value,
218 <          // so wrap this processor potato back to 0:        
219 <
220 <          potatoes[which_node] = 0;          
221 <          MPI_Send(0, 1, MPI_INT, which_node, 0, MPI_COMM_WORLD);
222 <          
223 <        }
224 <
225 <        myPotato = potatoes[which_node];        
226 <        
227 <        MPI_Recv(MPIatomTypeString, MINIBUFFERSIZE, MPI_CHAR, which_node,
228 <                 myPotato, MPI_COMM_WORLD, &istatus);
229 <        
230 <        strncpy(atomTypeString, MPIatomTypeString, MINIBUFFERSIZE);
231 <        
232 <        // Null terminate the atomTypeString just in case:
233 <
234 <        atomTypeString[strlen(atomTypeString) - 1] = '\0';
235 <
236 <        myPotato++;
237 <
238 <        MPI_Recv(&isDirectional, 1, MPI_INT, which_node,
239 <                 myPotato, MPI_COMM_WORLD, &istatus);
240 <              
241 <        myPotato++;
242 <
243 <        if (isDirectional) {          
244 <          MPI_Recv(atomData13, 13, MPI_DOUBLE, which_node,
245 <                   myPotato, MPI_COMM_WORLD, &istatus);
246 <        } else {
247 <          MPI_Recv(atomData6, 6, MPI_DOUBLE, which_node,
248 <                   myPotato, MPI_COMM_WORLD, &istatus);          
249 <        }
250 <        
251 <        myPotato++;
252 <        potatoes[which_node] = myPotato;
253 <
254 <      } else {
255 <        
256 <        haveError = 0;
257 <        which_atom = i;
258 <        local_index=-1;
259 <        
260 <        for (j=0; (j<mpiSim->getMyNlocal()) && (local_index < 0); j++) {
261 <          if (atoms[j]->getGlobalIndex() == which_atom) local_index = j;
262 <        }
263 <        
264 <        if (local_index != -1) {
265 <          
266 <          atomTypeString = atoms[local_index]->getType();
267 <
268 <          atoms[local_index]->getPos(pos);
269 <          atoms[local_index]->getVel(vel);          
270 <
271 <          atomData6[0] = pos[0];
272 <          atomData6[1] = pos[1];
273 <          atomData6[2] = pos[2];
274 <
275 <          atomData6[3] = vel[0];
276 <          atomData6[4] = vel[1];
277 <          atomData6[5] = vel[2];
278 <          
279 <          isDirectional = 0;
280 <
281 <          if( atoms[local_index]->isDirectional() ){
282 <
283 <            isDirectional = 1;
284 <            
285 <            dAtom = (DirectionalAtom *)atoms[local_index];
286 <            dAtom->getQ( q );
287 <
288 <            for (int j = 0; j < 6 ; j++)
289 <              atomData13[j] = atomData6[j];            
290 <            
291 <            atomData13[6] = q[0];
292 <            atomData13[7] = q[1];
293 <            atomData13[8] = q[2];
294 <            atomData13[9] = q[3];
295 <            
296 <            atomData13[10] = dAtom->getJx();
297 <            atomData13[11] = dAtom->getJy();
298 <            atomData13[12] = dAtom->getJz();
299 <          }
300 <          
301 <        } else {
302 <          sprintf(painCave.errMsg,
303 <                  "Atom %d not found on processor %d\n",
304 <                  i, worldRank );
305 <          haveError= 1;
306 <          simError();
307 <        }
308 <        
309 <        if(haveError) DieDieDie();
310 <        
311 <        // If we've survived to here, format the line:
312 <        
313 <        if (!isDirectional) {
314 <
315 <          sprintf( tempBuffer,
316 <                   "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t",
317 <                   atomTypeString,
318 <                   atomData6[0],
319 <                   atomData6[1],
320 <                   atomData6[2],
321 <                   atomData6[3],
322 <                   atomData6[4],
323 <                   atomData6[5]);
324 <          
325 <          strcpy( writeLine, tempBuffer );
326 <          strcat( writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n" );
327 <
328 <        } else {
329 <          
330 <          sprintf( tempBuffer,
331 <                   "%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",
332 <                   atomTypeString,
333 <                   atomData13[0],
334 <                   atomData13[1],
335 <                   atomData13[2],
336 <                   atomData13[3],
337 <                   atomData13[4],
338 <                   atomData13[5],
339 <                   atomData13[6],
340 <                   atomData13[7],
341 <                   atomData13[8],
342 <                   atomData13[9],
343 <                   atomData13[10],
344 <                   atomData13[11],
345 <                   atomData13[12]);
346 <          
347 <          strcat( writeLine, tempBuffer );
348 <          
349 <        }
350 <        
351 <        outFile << writeLine;
352 <        outFile.flush();
353 <      }
150 >    if( !finalOut ){
151 >      sprintf( painCave.errMsg,
152 >               "Could not open \"%s\" for final dump output.\n",
153 >               entry_plug->finalName );
154 >      painCave.isFatal = 1;
155 >      simError();
156      }
157  
158 <    outFile.flush();
159 <    sprintf( checkPointMsg,
160 <             "Sucessfully took a dump.\n");
161 <    MPIcheckPoint();        
162 <    
163 <  } else {
158 > #ifdef IS_MPI
159 >  }
160 > #endif // is_mpi
161 >  
162 >  fileStreams.push_back(&finalOut);  
163 >  writeFrame(fileStreams, currentTime);
164  
165 <    // worldRank != 0, so I'm a remote node.  
166 <
167 <    // Set my magic potato to 0:
366 <
367 <    myPotato = 0;
368 <    
369 <    for (i = 0 ; i < mpiSim->getTotAtoms(); i++ ) {
370 <      
371 <      // Am I the node which has this atom?
372 <      
373 <      if (AtomToProcMap[i] == worldRank) {
374 <
375 <        if (myPotato + 3 >= MAXTAG) {
376 <
377 <          // The potato was going to exceed the maximum value,
378 <          // so wrap this processor potato back to 0 (and block until
379 <          // node 0 says we can go:
380 <
381 <          MPI_Recv(&myPotato, 1, MPI_INT, 0, 0, MPI_COMM_WORLD, &istatus);
382 <          
383 <        }
384 <
385 <        local_index=-1;
386 <        for (j=0; (j<mpiSim->getMyNlocal()) && (local_index < 0); j++) {
387 <          if (atoms[j]->getGlobalIndex() == which_atom) local_index = j;
388 <        }
389 <        if (local_index != -1) {
390 <        
391 <          atomTypeString = atoms[local_index]->getType();
392 <
393 <          atoms[local_index]->getPos(pos);
394 <          atoms[local_index]->getVel(vel);
395 <
396 <          atomData6[0] = pos[0];
397 <          atomData6[1] = pos[1];
398 <          atomData6[2] = pos[2];
399 <
400 <          atomData6[3] = vel[0];
401 <          atomData6[4] = vel[1];
402 <          atomData6[5] = vel[2];
403 <          
404 <          isDirectional = 0;
405 <
406 <          if( atoms[local_index]->isDirectional() ){
407 <
408 <            isDirectional = 1;
409 <            
410 <            dAtom = (DirectionalAtom *)atoms[local_index];
411 <            dAtom->getQ( q );
412 <            
413 <            for (int j = 0; j < 6 ; j++)
414 <              atomData13[j] = atomData6[j];
415 <            
416 <            atomData13[6] = q[0];
417 <            atomData13[7] = q[1];
418 <            atomData13[8] = q[2];
419 <            atomData13[9] = q[3];
420 <
421 <            atomData13[10] = dAtom->getJx();
422 <            atomData13[11] = dAtom->getJy();
423 <            atomData13[12] = dAtom->getJz();
424 <          }
425 <
426 <        } else {
427 <          sprintf(painCave.errMsg,
428 <                  "Atom %d not found on processor %d\n",
429 <                  i, worldRank );
430 <          haveError= 1;
431 <          simError();
432 <        }
433 <
434 <        strncpy(MPIatomTypeString, atomTypeString, MINIBUFFERSIZE);
435 <
436 <        // null terminate the string before sending (just in case):
437 <        MPIatomTypeString[MINIBUFFERSIZE-1] = '\0';
438 <
439 <        MPI_Send(MPIatomTypeString, MINIBUFFERSIZE, MPI_CHAR, 0,
440 <                 myPotato, MPI_COMM_WORLD);
441 <        
442 <        myPotato++;
443 <
444 <        MPI_Send(&isDirectional, 1, MPI_INT, 0,
445 <                 myPotato, MPI_COMM_WORLD);
446 <        
447 <        myPotato++;
448 <        
449 <        if (isDirectional) {
450 <
451 <          MPI_Send(atomData13, 13, MPI_DOUBLE, 0,
452 <                   myPotato, MPI_COMM_WORLD);
453 <          
454 <        } else {
455 <
456 <          MPI_Send(atomData6, 6, MPI_DOUBLE, 0,
457 <                   myPotato, MPI_COMM_WORLD);
458 <        }
459 <
460 <        myPotato++;      
461 <      }
462 <    }
463 <
464 <    sprintf( checkPointMsg,
465 <             "Sucessfully took a dump.\n");
466 <    MPIcheckPoint();        
467 <    
468 <  }
165 > #ifdef IS_MPI
166 >  finalOut.close();
167 > #endif
168    
470 – #endif // is_mpi
169   }
170  
171 < void DumpWriter::writeFinal(double finalTime){
171 > void DumpWriter::writeFrame( vector<ofstream*>& outFile, double currentTime ){
172  
475 –  char finalName[500];
476 –  ofstream finalOut;
477 –
173    const int BUFFERSIZE = 2000;
174    const int MINIBUFFERSIZE = 100;
175 <  char tempBuffer[BUFFERSIZE];
175 >
176 >  char tempBuffer[BUFFERSIZE];  
177    char writeLine[BUFFERSIZE];
178  
179 <  double q[4];
180 <  DirectionalAtom* dAtom;
485 <  Atom** atoms = entry_plug->atoms;
486 <  int i;
179 >  int i, k;
180 >
181   #ifdef IS_MPI
182    
183 +  /*********************************************************************
184 +   * Documentation?  You want DOCUMENTATION?
185 +   *
186 +   * Why all the potatoes below?  
187 +   *
188 +   * To make a long story short, the original version of DumpWriter
189 +   * worked in the most inefficient way possible.  Node 0 would
190 +   * poke each of the node for an individual atom's formatted data
191 +   * as node 0 worked its way down the global index. This was particularly
192 +   * inefficient since the method blocked all processors at every atom
193 +   * (and did it twice!).
194 +   *
195 +   * An intermediate version of DumpWriter could be described from Node
196 +   * zero's perspective as follows:
197 +   *
198 +   *  1) Have 100 of your friends stand in a circle.
199 +   *  2) When you say go, have all of them start tossing potatoes at
200 +   *     you (one at a time).
201 +   *  3) Catch the potatoes.
202 +   *
203 +   * It was an improvement, but MPI has buffers and caches that could
204 +   * best be described in this analogy as "potato nets", so there's no
205 +   * need to block the processors atom-by-atom.
206 +   *
207 +   * This new and improved DumpWriter works in an even more efficient
208 +   * way:
209 +   *
210 +   *  1) Have 100 of your friend stand in a circle.
211 +   *  2) When you say go, have them start tossing 5-pound bags of
212 +   *     potatoes at you.
213 +   *  3) Once you've caught a friend's bag of potatoes,
214 +   *     toss them a spud to let them know they can toss another bag.
215 +   *
216 +   * How's THAT for documentation?
217 +   *
218 +   *********************************************************************/
219 +
220    int *potatoes;
221    int myPotato;
222  
223    int nProc;
224 <  int j, which_node, done, which_atom, local_index;
224 >  int j, which_node, done, which_atom, local_index, currentIndex;
225    double atomData6[6];
226    double atomData13[13];
227    int isDirectional;
# Line 501 | Line 232 | void DumpWriter::writeFinal(double finalTime){
232    int nAtoms = entry_plug->n_atoms;
233   #endif //is_mpi
234  
235 +  double q[4];
236 +  DirectionalAtom* dAtom;
237 +  Atom** atoms = entry_plug->atoms;
238    double pos[3], vel[3];
239  
506 – #ifdef IS_MPI
507 –  if(worldRank == 0 ){
508 – #endif // is_mpi
509 –
510 –    strcpy( finalName, entry_plug->finalName );
511 –
512 –    finalOut.open( finalName, ios::out | ios::trunc );
513 –    if( !finalOut ){
514 –      sprintf( painCave.errMsg,
515 –               "Could not open \"%s\" for final dump output.\n",
516 –               finalName );
517 –      painCave.isFatal = 1;
518 –      simError();
519 –    }
520 –
521 –    // finalOut.setf( ios::scientific );
522 –
523 – #ifdef IS_MPI
524 –  }
525 –
526 –  sprintf(checkPointMsg,"Opened file for final configuration\n");
527 –  MPIcheckPoint();
528 –
529 – #endif //is_mpi
530 –
531 –
240   #ifndef IS_MPI
241 +  
242 +  for(k = 0; k < outFile.size(); k++){
243 +    *outFile[k] << nAtoms << "\n";
244  
245 <  finalOut << nAtoms << "\n";
245 >    *outFile[k] << currentTime << ";\t"
246 >               << entry_plug->Hmat[0][0] << "\t"
247 >                     << entry_plug->Hmat[1][0] << "\t"
248 >                     << entry_plug->Hmat[2][0] << ";\t"
249 >              
250 >               << entry_plug->Hmat[0][1] << "\t"
251 >                     << entry_plug->Hmat[1][1] << "\t"
252 >                     << entry_plug->Hmat[2][1] << ";\t"
253  
254 <  finalOut << finalTime << ";\t"
255 <           << entry_plug->Hmat[0][0] << "\t"
256 <           << entry_plug->Hmat[1][0] << "\t"
539 <           << entry_plug->Hmat[2][0] << ";\t"
254 >                     << entry_plug->Hmat[0][2] << "\t"
255 >                     << entry_plug->Hmat[1][2] << "\t"
256 >                     << entry_plug->Hmat[2][2] << ";";
257  
258 <           << entry_plug->Hmat[0][1] << "\t"
259 <           << entry_plug->Hmat[1][1] << "\t"
260 <           << entry_plug->Hmat[2][1] << ";\t"
261 <
545 <           << entry_plug->Hmat[0][2] << "\t"
546 <           << entry_plug->Hmat[1][2] << "\t"
547 <           << entry_plug->Hmat[2][2] << ";";
548 <
549 <  //write out additional parameters, such as chi and eta
550 <  finalOut << entry_plug->the_integrator->getAdditionalParameters();
551 <  finalOut << endl;
552 <
258 >    //write out additional parameters, such as chi and eta
259 >    *outFile[k] << entry_plug->the_integrator->getAdditionalParameters() << endl;
260 >  }
261 >  
262    for( i=0; i<nAtoms; i++ ){
263  
264      atoms[i]->getPos(pos);
# Line 585 | Line 294 | void DumpWriter::writeFinal(double finalTime){
294      else
295        strcat( writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n" );
296  
297 <    finalOut << writeLine;
297 >    for(k = 0; k < outFile.size(); k++)
298 >      *outFile[k] << writeLine;
299    }
590 –  finalOut.flush();
591 –  finalOut.close();
300  
301   #else // is_mpi
302  
303    /* code to find maximum tag value */
304 +  
305    int *tagub, flag, MAXTAG;
306    MPI_Attr_get(MPI_COMM_WORLD, MPI_TAG_UB, &tagub, &flag);
307    if (flag) {
# Line 615 | Line 324 | void DumpWriter::writeFinal(double finalTime){
324      nProc = mpiSim->getNumberProcessors();
325      potatoes = new int[nProc];
326  
327 +    //write out the comment lines
328      for (i = 0; i < nProc; i++)
329        potatoes[i] = 0;
330      
331 <    finalOut << mpiSim->getTotAtoms() << "\n";
331 >      for(k = 0; k < outFile.size(); k++){
332 >        *outFile[k] << mpiSim->getTotAtoms() << "\n";
333  
334 <    finalOut << finalTime << ";\t"
335 <            << entry_plug->Hmat[0][0] << "\t"
336 <            << entry_plug->Hmat[1][0] << "\t"
337 <            << entry_plug->Hmat[2][0] << ";\t"
627 <
628 <            << entry_plug->Hmat[0][1] << "\t"
629 <            << entry_plug->Hmat[1][1] << "\t"
630 <            << entry_plug->Hmat[2][1] << ";\t"
334 >        *outFile[k] << currentTime << ";\t"
335 >                         << entry_plug->Hmat[0][0] << "\t"
336 >                         << entry_plug->Hmat[1][0] << "\t"
337 >                         << entry_plug->Hmat[2][0] << ";\t"
338  
339 <            << entry_plug->Hmat[0][2] << "\t"
340 <            << entry_plug->Hmat[1][2] << "\t"
341 <            << entry_plug->Hmat[2][2] << ";";
339 >                         << entry_plug->Hmat[0][1] << "\t"
340 >                         << entry_plug->Hmat[1][1] << "\t"
341 >                         << entry_plug->Hmat[2][1] << ";\t"
342  
343 <    finalOut << entry_plug->the_integrator->getAdditionalParameters();
344 <    finalOut << endl;
345 <    finalOut.flush();
343 >                         << entry_plug->Hmat[0][2] << "\t"
344 >                         << entry_plug->Hmat[1][2] << "\t"
345 >                         << entry_plug->Hmat[2][2] << ";";
346 >  
347 >        *outFile[k] << entry_plug->the_integrator->getAdditionalParameters() << endl;
348 >    }
349  
350 +    currentIndex = 0;
351 +
352      for (i = 0 ; i < mpiSim->getTotAtoms(); i++ ) {
353        
354        // Get the Node number which has this atom;
# Line 659 | Line 371 | void DumpWriter::writeFinal(double finalTime){
371          MPI_Recv(MPIatomTypeString, MINIBUFFERSIZE, MPI_CHAR, which_node,
372                   myPotato, MPI_COMM_WORLD, &istatus);
373          
374 <        strncpy(atomTypeString, MPIatomTypeString, MINIBUFFERSIZE);
375 <        
664 <        // Null terminate the atomTypeString just in case:
665 <
666 <        atomTypeString[strlen(atomTypeString) - 1] = '\0';
667 <
374 >        atomTypeString = MPIatomTypeString;
375 >        
376          myPotato++;
377  
378          MPI_Recv(&isDirectional, 1, MPI_INT, which_node,
# Line 685 | Line 393 | void DumpWriter::writeFinal(double finalTime){
393  
394        } else {
395          
396 <        haveError = 0;
396 >        haveError = 0;
397          which_atom = i;
690 –        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 <        }
399 >        //local_index = -1;
400 >
401 >        //for (j=0; (j<mpiSim->getMyNlocal()) && (local_index < 0); j++) {
402 >        //  if (atoms[j]->getGlobalIndex() == which_atom) local_index = j;
403 >        //}
404          
405 <        if (local_index != -1) {
405 >        //if (local_index != -1) {
406 >          
407 >          local_index = indexArray[currentIndex].first;        
408            
409 <          atomTypeString = atoms[local_index]->getType();
410 <
409 >          if (which_atom == indexArray[currentIndex].second) {
410 >            
411 >            atomTypeString = atoms[local_index]->getType();
412 >            
413            atoms[local_index]->getPos(pos);
414            atoms[local_index]->getVel(vel);          
415 <
415 >          
416            atomData6[0] = pos[0];
417            atomData6[1] = pos[1];
418            atomData6[2] = pos[2];
# Line 732 | Line 445 | void DumpWriter::writeFinal(double finalTime){
445            
446          } else {
447            sprintf(painCave.errMsg,
448 <                  "Atom %d not found on processor %d\n",
449 <                  i, worldRank );
448 >                  "Atom %d not found on processor %d, currentIndex = %d, local_index = %d\n",
449 >                  which_atom, worldRank, currentIndex, local_index );
450            haveError= 1;
451            simError();
452          }
453          
454 <        if(haveError) DieDieDie();
454 >        if(haveError) DieDieDie();
455          
456 <        // If we've survived to here, format the line:
457 <        
458 <        if (!isDirectional) {
459 <
460 <          sprintf( tempBuffer,
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 <          strcpy( writeLine, tempBuffer );
471 <          strcat( writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n" );
472 <
473 <        } else {
474 <          
475 <          sprintf( tempBuffer,
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 <          
779 <          strcat( writeLine, tempBuffer );
780 <          
781 <        }
456 >        currentIndex++;
457 >      }
458 >      // If we've survived to here, format the line:
459 >      
460 >      if (!isDirectional) {
461 >        
462 >        sprintf( writeLine,
463 >                 "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t",
464 >                 atomTypeString,
465 >                 atomData6[0],
466 >                 atomData6[1],
467 >                 atomData6[2],
468 >                 atomData6[3],
469 >                 atomData6[4],
470 >                 atomData6[5]);
471 >        
472 >        strcat( writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n" );
473 >        
474 >      } else {
475 >        
476 >        sprintf( writeLine,
477 >                 "%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",
478 >                 atomTypeString,
479 >                 atomData13[0],
480 >                 atomData13[1],
481 >                 atomData13[2],
482 >                 atomData13[3],
483 >                 atomData13[4],
484 >                 atomData13[5],
485 >                 atomData13[6],
486 >                 atomData13[7],
487 >                 atomData13[8],
488 >                 atomData13[9],
489 >                 atomData13[10],
490 >                 atomData13[11],
491 >                 atomData13[12]);
492          
783 –        finalOut << writeLine;
784 –        finalOut.flush();
493        }
494 +      
495 +      for(k = 0; k < outFile.size(); k++)
496 +        *outFile[k] << writeLine;
497      }
498 <
499 <    finalOut.flush();
498 >    
499 >    for(k = 0; k < outFile.size(); k++)
500 >      outFile[k]->flush();
501 >    
502      sprintf( checkPointMsg,
503               "Sucessfully took a dump.\n");
504 +    
505      MPIcheckPoint();        
506      
507 +    delete[] potatoes;
508 +    
509    } else {
510  
511      // worldRank != 0, so I'm a remote node.  
# Line 797 | Line 513 | void DumpWriter::writeFinal(double finalTime){
513      // Set my magic potato to 0:
514  
515      myPotato = 0;
516 +    currentIndex = 0;
517      
518      for (i = 0 ; i < mpiSim->getTotAtoms(); i++ ) {
519        
# Line 805 | Line 522 | void DumpWriter::writeFinal(double finalTime){
522        if (AtomToProcMap[i] == worldRank) {
523  
524          if (myPotato + 3 >= MAXTAG) {
525 <
525 >          
526            // The potato was going to exceed the maximum value,
527            // so wrap this processor potato back to 0 (and block until
528            // node 0 says we can go:
529 <
529 >          
530            MPI_Recv(&myPotato, 1, MPI_INT, 0, 0, MPI_COMM_WORLD, &istatus);
531            
532          }
533 +        which_atom = i;
534  
535 <        local_index=-1;
536 <        for (j=0; (j<mpiSim->getMyNlocal()) && (local_index < 0); j++) {
537 <          if (atoms[j]->getGlobalIndex() == which_atom) local_index = j;
538 <        }
539 <        if (local_index != -1) {
535 >        //local_index = -1;
536 >
537 >        //for (j=0; (j<mpiSim->getMyNlocal()) && (local_index < 0); j++) {
538 >        // if (atoms[j]->getGlobalIndex() == which_atom) local_index = j;
539 >        //}
540 >        
541 >        //if (local_index != -1) {
542 >
543 >        local_index = indexArray[currentIndex].first;        
544 >                
545 >        if (which_atom == indexArray[currentIndex].second) {
546          
547            atomTypeString = atoms[local_index]->getType();
548 <
548 >          
549            atoms[local_index]->getPos(pos);
550            atoms[local_index]->getVel(vel);
551 <
551 >          
552            atomData6[0] = pos[0];
553            atomData6[1] = pos[1];
554            atomData6[2] = pos[2];
# Line 849 | Line 573 | void DumpWriter::writeFinal(double finalTime){
573              atomData13[7] = q[1];
574              atomData13[8] = q[2];
575              atomData13[9] = q[3];
576 <
576 >  
577              atomData13[10] = dAtom->getJx();
578              atomData13[11] = dAtom->getJy();
579              atomData13[12] = dAtom->getJz();
# Line 857 | Line 581 | void DumpWriter::writeFinal(double finalTime){
581  
582          } else {
583            sprintf(painCave.errMsg,
584 <                  "Atom %d not found on processor %d\n",
585 <                  i, worldRank );
584 >                  "Atom %d not found on processor %d, currentIndex = %d, local_index = %d\n",
585 >                  which_atom, worldRank, currentIndex, local_index );
586            haveError= 1;
587            simError();
588          }
589 <
589 >        
590          strncpy(MPIatomTypeString, atomTypeString, MINIBUFFERSIZE);
591  
592          // null terminate the string before sending (just in case):
593          MPIatomTypeString[MINIBUFFERSIZE-1] = '\0';
594  
595          MPI_Send(MPIatomTypeString, MINIBUFFERSIZE, MPI_CHAR, 0,
596 <                 myPotato, MPI_COMM_WORLD);
596 >                             myPotato, MPI_COMM_WORLD);
597          
598          myPotato++;
599  
600          MPI_Send(&isDirectional, 1, MPI_INT, 0,
601 <                 myPotato, MPI_COMM_WORLD);
601 >                             myPotato, MPI_COMM_WORLD);
602          
603          myPotato++;
604          
# Line 889 | Line 613 | void DumpWriter::writeFinal(double finalTime){
613                     myPotato, MPI_COMM_WORLD);
614          }
615  
616 <        myPotato++;      
616 >        myPotato++;  
617 >        currentIndex++;    
618        }
619      }
620  
# Line 899 | Line 624 | void DumpWriter::writeFinal(double finalTime){
624      
625    }
626    
902 –  if( worldRank == 0 ) finalOut.close();
627   #endif // is_mpi
628   }
629  
906 –
907 –
630   #ifdef IS_MPI
631  
632   // a couple of functions to let us escape the write loop

Diff Legend

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