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 912 by gezelter, Thu Jan 8 18:59:36 2004 UTC vs.
Revision 1097 by gezelter, Mon Apr 12 20:32:20 2004 UTC

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

Diff Legend

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