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 910 by gezelter, Thu Jan 8 18:05:37 2004 UTC vs.
Revision 934 by tim, Tue Jan 13 20:04:28 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  
29 –    strcpy( outName, entry_plug->sampleName );
31  
32 <    outFile.open(outName, ios::out | ios::trunc );
32 >    dumpFile.open(entry_plug->sampleName, ios::out | ios::trunc );
33  
34 <    if( !outFile ){
34 >    if( !dumpFile ){
35  
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  
43 <    //outFile.setf( ios::scientific );
43 >    finalOut.open( entry_plug->finalName, ios::out | ios::trunc );
44 >    if( !finalOut ){
45 >      sprintf( painCave.errMsg,
46 >               "Could not open \"%s\" for final dump output.\n",
47 >               entry_plug->finalName );
48 >      painCave.isFatal = 1;
49 >      simError();
50 >    }
51  
52   #ifdef IS_MPI
53    }
54  
55 +  //sort the local atoms by global index
56 +  sortByGlobalIndex();
57 +  
58    sprintf( checkPointMsg,
59             "Sucessfully opened output file for dumping.\n");
60    MPIcheckPoint();
# Line 56 | Line 67 | DumpWriter::~DumpWriter( ){
67    if(worldRank == 0 ){
68   #endif // is_mpi
69  
70 <    outFile.close();
70 >    dumpFile.close();
71 >    finalOut.close();
72  
73   #ifdef IS_MPI
74    }
75   #endif // is_mpi
76   }
77  
78 < void DumpWriter::writeDump( double currentTime ){
78 > #ifdef IS_MPI
79  
80 + /**
81 + * A hook function to load balancing
82 + */
83 +
84 + void DumpWriter::update(){
85 +  sortByGlobalIndex();          
86 + }
87 +  
88 + /**
89 + * Auxiliary sorting function
90 + */
91 +
92 + bool indexSortingCriterion(const pair<int, int>& p1, const pair<int, int>& p2){
93 +  return p1.second < p2.second;
94 + }
95 +
96 + /**
97 + * Sorting the local index by global index
98 + */
99 +
100 + void DumpWriter::sortByGlobalIndex(){
101 +  Atom** atoms = entry_plug->atoms;
102 +  
103 +  indexArray.clear();
104 +  
105 +  for(int i = 0; i < mpiSim->getMyNlocal();i++)
106 +    indexArray.push_back(make_pair(i, atoms[i]->getGlobalIndex()));
107 +  
108 +  sort(indexArray.begin(), indexArray.end(), indexSortingCriterion);    
109 + }
110 + #endif
111 +
112 + void DumpWriter::writeDump(double currentTime){
113 +
114 +  vector<ofstream*> fileStreams;
115 +
116 + #ifdef IS_MPI
117 +  if(worldRank == 0 ){
118 +    finalOut.seekp(0);
119 +  }
120 + #endif // is_mpi
121 +
122 +  fileStreams.push_back(&finalOut);
123 +  fileStreams.push_back(&dumpFile);
124 +
125 +  writeFrame(fileStreams, currentTime);
126 +        
127 + }
128 +
129 + void DumpWriter::writeFinal(double currentTime){
130 +
131 +  vector<ofstream*> fileStreams;
132 +
133 + #ifdef IS_MPI
134 +  if(worldRank == 0 ){
135 +    finalOut.seekp(0);
136 +  }
137 + #endif // is_mpi
138 +  
139 +  fileStreams.push_back(&finalOut);  
140 +  writeFrame(fileStreams, currentTime);
141 +  
142 + }
143 +
144 + void DumpWriter::writeFrame( vector<ofstream*>& outFile, double currentTime ){
145 +
146    const int BUFFERSIZE = 2000;
147 <  const int MINIBUFFERSIZE = 10;
147 >  const int MINIBUFFERSIZE = 100;
148  
149    char tempBuffer[BUFFERSIZE];
150    char writeLine[BUFFERSIZE];
151  
152 <  int i;
152 >  int i, k;
153 >
154   #ifdef IS_MPI
155 <  int j, which_node, done, which_atom, local_index;
156 <  double atomTransData[6];
157 <  double atomOrientData[7];
155 >  
156 >  int *potatoes;
157 >  int myPotato;
158 >
159 >  int nProc;
160 >  int j, which_node, done, which_atom, local_index, currentIndex;
161 >  double atomData6[6];
162 >  double atomData13[13];
163    int isDirectional;
164    char* atomTypeString;
165    char MPIatomTypeString[MINIBUFFERSIZE];
166 <  int me;
83 <  int atomTypeTag;
84 <  int atomIsDirectionalTag;
85 <  int atomTransDataTag;
86 <  int atomOrientDataTag;
166 >
167   #else //is_mpi
168    int nAtoms = entry_plug->n_atoms;
169   #endif //is_mpi
# Line 93 | Line 173 | void DumpWriter::writeDump( double currentTime ){
173    Atom** atoms = entry_plug->atoms;
174    double pos[3], vel[3];
175  
96 –  // write current frame to the eor file
97 –
98 –  this->writeFinal( currentTime );
99 –
176   #ifndef IS_MPI
177 +  
178 +  for(k = 0; k < outFile.size(); k++){
179 +    *outFile[k] << nAtoms << "\n";
180  
181 <  outFile << nAtoms << "\n";
181 >    *outFile[k] << currentTime << ";\t"
182 >               << entry_plug->Hmat[0][0] << "\t"
183 >                     << entry_plug->Hmat[1][0] << "\t"
184 >                     << entry_plug->Hmat[2][0] << ";\t"
185 >              
186 >               << entry_plug->Hmat[0][1] << "\t"
187 >                     << entry_plug->Hmat[1][1] << "\t"
188 >                     << entry_plug->Hmat[2][1] << ";\t"
189  
190 <  outFile << currentTime << ";\t"
191 <          << entry_plug->Hmat[0][0] << "\t"
192 <          << entry_plug->Hmat[1][0] << "\t"
107 <          << entry_plug->Hmat[2][0] << ";\t"
190 >                     << entry_plug->Hmat[0][2] << "\t"
191 >                     << entry_plug->Hmat[1][2] << "\t"
192 >                     << entry_plug->Hmat[2][2] << ";";
193  
194 <          << entry_plug->Hmat[0][1] << "\t"
195 <          << entry_plug->Hmat[1][1] << "\t"
196 <          << entry_plug->Hmat[2][1] << ";\t"
197 <
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 <
194 >    //write out additional parameters, such as chi and eta
195 >    *outFile[k] << entry_plug->the_integrator->getAdditionalParameters() << endl;
196 >  }
197 >  
198    for( i=0; i<nAtoms; i++ ){
199  
200      atoms[i]->getPos(pos);
# Line 152 | Line 230 | void DumpWriter::writeDump( double currentTime ){
230      else
231        strcat( writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n" );
232  
233 <    outFile << writeLine;
233 >    for(k = 0; k < outFile.size(); k++)
234 >      *outFile[k] << writeLine;
235    }
157 –  outFile.flush();
236  
237   #else // is_mpi
238  
239 <  // first thing first, suspend fatalities.
240 <  painCave.isEventLoop = 1;
239 >  /* code to find maximum tag value */
240 >  
241 >  int *tagub, flag, MAXTAG;
242 >  MPI_Attr_get(MPI_COMM_WORLD, MPI_TAG_UB, &tagub, &flag);
243 >  if (flag) {
244 >    MAXTAG = *tagub;
245 >  } else {
246 >    MAXTAG = 32767;
247 >  }  
248  
164 –  int myStatus; // 1 = wakeup & success; 0 = error; -1 = AllDone
249    int haveError;
250  
251    MPI_Status istatus;
# Line 170 | Line 254 | void DumpWriter::writeDump( double currentTime ){
254    // write out header and node 0's coordinates
255  
256    if( worldRank == 0 ){
173 –    outFile << mpiSim->getTotAtoms() << "\n";
257  
258 <    outFile << currentTime << ";\t"
176 <            << entry_plug->Hmat[0][0] << "\t"
177 <            << entry_plug->Hmat[1][0] << "\t"
178 <            << entry_plug->Hmat[2][0] << ";\t"
258 >    // Node 0 needs a list of the magic potatoes for each processor;
259  
260 <            << entry_plug->Hmat[0][1] << "\t"
261 <            << entry_plug->Hmat[1][1] << "\t"
182 <            << entry_plug->Hmat[2][1] << ";\t"
260 >    nProc = mpiSim->getNumberProcessors();
261 >    potatoes = new int[nProc];
262  
263 <            << entry_plug->Hmat[0][2] << "\t"
264 <            << entry_plug->Hmat[1][2] << "\t"
265 <            << entry_plug->Hmat[2][2] << ";";
263 >    //write out the comment lines
264 >    for (i = 0; i < nProc; i++)
265 >      potatoes[i] = 0;
266 >    
267 >      for(k = 0; k < outFile.size(); k++){
268 >        *outFile[k] << mpiSim->getTotAtoms() << "\n";
269  
270 <    outFile << entry_plug->the_integrator->getAdditionalParameters();
271 <    outFile << endl;
272 <    outFile.flush();
270 >        *outFile[k] << currentTime << ";\t"
271 >                         << entry_plug->Hmat[0][0] << "\t"
272 >                         << entry_plug->Hmat[1][0] << "\t"
273 >                         << entry_plug->Hmat[2][0] << ";\t"
274 >
275 >                         << entry_plug->Hmat[0][1] << "\t"
276 >                         << entry_plug->Hmat[1][1] << "\t"
277 >                         << entry_plug->Hmat[2][1] << ";\t"
278 >
279 >                         << entry_plug->Hmat[0][2] << "\t"
280 >                         << entry_plug->Hmat[1][2] << "\t"
281 >                         << entry_plug->Hmat[2][2] << ";";
282 >  
283 >        *outFile[k] << entry_plug->the_integrator->getAdditionalParameters() << endl;
284 >    }
285 >
286 >    currentIndex = 0;
287 >
288      for (i = 0 ; i < mpiSim->getTotAtoms(); i++ ) {
289 +      
290        // Get the Node number which has this atom;
291 <
291 >      
292        which_node = AtomToProcMap[i];
293 <
293 >      
294        if (which_node != 0) {
197 –        
198 –        atomTypeTag          = 4*i;
199 –        atomIsDirectionalTag = 4*i + 1;
200 –        atomTransDataTag     = 4*i + 2;
201 –        atomOrientDataTag    = 4*i + 3;
295  
296 <        MPI_Recv(MPIatomTypeString, MINIBUFFERSIZE, MPI_CHAR, which_node,
297 <                 atomTypeTag, MPI_COMM_WORLD, &istatus);
298 <        
206 <        strncpy(atomTypeString, MPIatomTypeString, MINIBUFFERSIZE);
296 >        if (potatoes[which_node] + 3 >= MAXTAG) {
297 >          // The potato was going to exceed the maximum value,
298 >          // so wrap this processor potato back to 0:        
299  
300 <        MPI_Recv(&isDirectional, 1, MPI_INT, which_node,
301 <                 atomIsDirectionalTag, MPI_COMM_WORLD, &istatus);
302 <        
211 <        MPI_Recv(atomTransData, 6, MPI_DOUBLE, which_node,
212 <                 atomTransDataTag, MPI_COMM_WORLD, &istatus);
213 <
214 <        if (isDirectional) {
215 <
216 <          MPI_Recv(atomOrientData, 7, MPI_DOUBLE, which_node,
217 <                   atomOrientDataTag, MPI_COMM_WORLD, &istatus);
218 <
300 >          potatoes[which_node] = 0;          
301 >          MPI_Send(0, 1, MPI_INT, which_node, 0, MPI_COMM_WORLD);
302 >          
303          }
304  
305 <      } else {
305 >        myPotato = potatoes[which_node];        
306          
307 <        haveError = 0;
308 <        which_atom = i;
225 <        local_index=-1;
226 <
227 <        for (j=0; (j<mpiSim->getMyNlocal()) && (local_index < 0); j++) {
228 <          if (atoms[j]->getGlobalIndex() == which_atom) local_index = j;
229 <        }
230 <
231 <        if (local_index != -1) {
232 <
233 <          atomTypeString = atoms[local_index]->getType();
234 <
235 <          atoms[local_index]->getPos(pos);
236 <          atoms[local_index]->getVel(vel);
237 <
238 <          atomTransData[0] = pos[0];
239 <          atomTransData[1] = pos[1];
240 <          atomTransData[2] = pos[2];
241 <
242 <          atomTransData[3] = vel[0];
243 <          atomTransData[4] = vel[1];
244 <          atomTransData[5] = vel[2];
245 <          
246 <          isDirectional = 0;
247 <
248 <          if( atoms[local_index]->isDirectional() ){
249 <
250 <            isDirectional = 1;
251 <            
252 <            dAtom = (DirectionalAtom *)atoms[local_index];
253 <            dAtom->getQ( q );
254 <            
255 <            atomOrientData[0] = q[0];
256 <            atomOrientData[1] = q[1];
257 <            atomOrientData[2] = q[2];
258 <            atomOrientData[3] = q[3];
259 <
260 <            atomOrientData[4] = dAtom->getJx();
261 <            atomOrientData[5] = dAtom->getJy();
262 <            atomOrientData[6] = dAtom->getJz();
263 <          }
264 <
265 <        } else {
266 <          sprintf(painCave.errMsg,
267 <                  "Atom %d not found on processor %d\n",
268 <                  i, worldRank );
269 <          haveError= 1;
270 <          simError();
271 <        }
272 <
273 <        if(haveError) DieDieDie();
274 <                              
275 <        // If we've survived to here, format the line:
307 >        MPI_Recv(MPIatomTypeString, MINIBUFFERSIZE, MPI_CHAR, which_node,
308 >                 myPotato, MPI_COMM_WORLD, &istatus);
309          
310 <        sprintf( tempBuffer,
311 <                 "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t",
312 <                 atomTypeString,
280 <                 atomTransData[0],
281 <                 atomTransData[1],
282 <                 atomTransData[2],
283 <                 atomTransData[3],
284 <                 atomTransData[4],
285 <                 atomTransData[5]);
310 >        atomTypeString = MPIatomTypeString;
311 >        
312 >        myPotato++;
313  
314 <        strcpy( writeLine, tempBuffer );
314 >        MPI_Recv(&isDirectional, 1, MPI_INT, which_node,
315 >                 myPotato, MPI_COMM_WORLD, &istatus);
316 >              
317 >        myPotato++;
318  
319 <        if (isDirectional) {
320 <
321 <          sprintf( tempBuffer,
292 <                   "%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\n",
293 <                   atomOrientData[0],
294 <                   atomOrientData[1],
295 <                   atomOrientData[2],
296 <                   atomOrientData[3],
297 <                   atomOrientData[4],
298 <                   atomOrientData[5],
299 <                   atomOrientData[6]);
300 <          strcat( writeLine, tempBuffer );
301 <
319 >        if (isDirectional) {          
320 >          MPI_Recv(atomData13, 13, MPI_DOUBLE, which_node,
321 >                   myPotato, MPI_COMM_WORLD, &istatus);
322          } else {
323 <          strcat( writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n" );
323 >          MPI_Recv(atomData6, 6, MPI_DOUBLE, which_node,
324 >                   myPotato, MPI_COMM_WORLD, &istatus);          
325          }
326 +        
327 +        myPotato++;
328 +        potatoes[which_node] = myPotato;
329  
330 <        outFile << writeLine;
331 <        outFile.flush();
332 <      }
333 <    }
334 <
335 <    outFile.flush();
336 <    sprintf( checkPointMsg,
337 <             "Sucessfully took a dump.\n");
338 <    MPIcheckPoint();        
315 <    
316 <  } else {
317 <
318 <    // worldRank != 0, so I'm a remote node.  
319 <    
320 <    for (i = 0 ; i < mpiSim->getTotAtoms(); i++ ) {
321 <      
322 <      // Am I the node which has this atom?
323 <      
324 <      if (AtomToProcMap[i] == worldRank) {
325 <
326 <        local_index=-1;
327 <        for (j=0; (j<mpiSim->getMyNlocal()) && (local_index < 0); j++) {
328 <          if (atoms[j]->getGlobalIndex() == which_atom) local_index = j;
329 <        }
330 <        if (local_index != -1) {
331 <        
330 >      } else {
331 >        
332 >        haveError = 0;
333 >              which_atom = i;
334 >        
335 >        local_index = indexArray[currentIndex].first;        
336 >                
337 >        if (which_atom == indexArray[currentIndex].second) {
338 >          
339            atomTypeString = atoms[local_index]->getType();
340  
341 <          atoms[local_index]->getPos(pos);
342 <          atoms[local_index]->getVel(vel);
341 >                atoms[local_index]->getPos(pos);
342 >                atoms[local_index]->getVel(vel);          
343  
344 <          atomTransData[0] = pos[0];
345 <          atomTransData[1] = pos[1];
346 <          atomTransData[2] = pos[2];
344 >          atomData6[0] = pos[0];
345 >          atomData6[1] = pos[1];
346 >          atomData6[2] = pos[2];
347  
348 <          atomTransData[3] = vel[0];
349 <          atomTransData[4] = vel[1];
350 <          atomTransData[5] = vel[2];
348 >          atomData6[3] = vel[0];
349 >          atomData6[4] = vel[1];
350 >          atomData6[5] = vel[2];
351            
352            isDirectional = 0;
353  
# Line 350 | Line 357 | void DumpWriter::writeDump( double currentTime ){
357              
358              dAtom = (DirectionalAtom *)atoms[local_index];
359              dAtom->getQ( q );
353 –            
354 –            atomOrientData[0] = q[0];
355 –            atomOrientData[1] = q[1];
356 –            atomOrientData[2] = q[2];
357 –            atomOrientData[3] = q[3];
360  
361 <            atomOrientData[4] = dAtom->getJx();
362 <            atomOrientData[5] = dAtom->getJy();
363 <            atomOrientData[6] = dAtom->getJz();
361 >            for (int j = 0; j < 6 ; j++)
362 >              atomData13[j] = atomData6[j];            
363 >            
364 >            atomData13[6] = q[0];
365 >            atomData13[7] = q[1];
366 >            atomData13[8] = q[2];
367 >            atomData13[9] = q[3];
368 >            
369 >            atomData13[10] = dAtom->getJx();
370 >            atomData13[11] = dAtom->getJy();
371 >            atomData13[12] = dAtom->getJz();
372            }
373 <
373 >          
374          } else {
375 <          sprintf(painCave.errMsg,
376 <                  "Atom %d not found on processor %d\n",
377 <                  i, worldRank );
378 <          haveError= 1;
379 <          simError();
380 <        }
371 <
372 <        // I've survived this far, so send off the data!
373 <
374 <        atomTypeTag          = 4*i;
375 <        atomIsDirectionalTag = 4*i + 1;
376 <        atomTransDataTag     = 4*i + 2;
377 <        atomOrientDataTag    = 4*i + 3;
378 <
379 <
380 <        strncpy(MPIatomTypeString, atomTypeString, MINIBUFFERSIZE);
381 <
382 <        MPI_Send(MPIatomTypeString, MINIBUFFERSIZE, MPI_CHAR, 0,
383 <                 atomTypeTag, MPI_COMM_WORLD);
375 >          sprintf(painCave.errMsg,
376 >                              "Atom %d not found on processor %d\n",
377 >                              i, worldRank );
378 >                haveError= 1;
379 >                simError();
380 >              }
381          
382 <        MPI_Send(&isDirectional, 1, MPI_INT, 0,
386 <                 atomIsDirectionalTag, MPI_COMM_WORLD);
382 >        if(haveError) DieDieDie();
383          
384 <        MPI_Send(atomTransData, 6, MPI_DOUBLE, 0,
389 <                 atomTransDataTag, MPI_COMM_WORLD);
390 <
391 <        if (isDirectional) {
392 <
393 <          MPI_Send(atomOrientData, 7, MPI_DOUBLE, 0,
394 <                   atomOrientDataTag, MPI_COMM_WORLD);
395 <          
396 <        }
397 <      
384 >        currentIndex ++;
385        }
386 <    }
386 >      // If we've survived to here, format the line:
387 >      
388 >      if (!isDirectional) {
389 >        
390 >        sprintf( writeLine,
391 >                             "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t",
392 >                             atomTypeString,
393 >                             atomData6[0],
394 >                             atomData6[1],
395 >                             atomData6[2],
396 >                             atomData6[3],
397 >                             atomData6[4],
398 >                             atomData6[5]);
399  
400 <    sprintf( checkPointMsg,
401 <             "Sucessfully took a dump.\n");
403 <    MPIcheckPoint();        
404 <    
405 <  }
406 <  
407 <  painCave.isEventLoop = 0;
408 <
409 < #endif // is_mpi
410 < }
411 <
412 < void DumpWriter::writeFinal(double finalTime){
413 <
414 <  char finalName[500];
415 <  ofstream finalOut;
416 <
417 <  const int BUFFERSIZE = 2000;
418 <  const int MINIBUFFERSIZE = 10;
419 <  char tempBuffer[BUFFERSIZE];
420 <  char writeLine[BUFFERSIZE];
421 <
422 <  double q[4];
423 <  DirectionalAtom* dAtom;
424 <  Atom** atoms = entry_plug->atoms;
425 <  int i;
426 < #ifdef IS_MPI
427 <  int j, which_node, done, which_atom, local_index;
428 <  double atomTransData[6];
429 <  double atomOrientData[7];
430 <  int isDirectional;
431 <  char* atomTypeString;
432 <  char MPIatomTypeString[MINIBUFFERSIZE];
433 <  int atomTypeTag;
434 <  int atomIsDirectionalTag;
435 <  int atomTransDataTag;
436 <  int atomOrientDataTag;
437 < #else //is_mpi
438 <  int nAtoms = entry_plug->n_atoms;
439 < #endif //is_mpi
440 <
441 <  double pos[3], vel[3];
442 <
443 < #ifdef IS_MPI
444 <  if(worldRank == 0 ){
445 < #endif // is_mpi
446 <
447 <    strcpy( finalName, entry_plug->finalName );
448 <
449 <    finalOut.open( finalName, ios::out | ios::trunc );
450 <    if( !finalOut ){
451 <      sprintf( painCave.errMsg,
452 <               "Could not open \"%s\" for final dump output.\n",
453 <               finalName );
454 <      painCave.isFatal = 1;
455 <      simError();
456 <    }
457 <
458 <    // finalOut.setf( ios::scientific );
459 <
460 < #ifdef IS_MPI
461 <  }
462 <
463 <  sprintf(checkPointMsg,"Opened file for final configuration\n");
464 <  MPIcheckPoint();
465 <
466 < #endif //is_mpi
467 <
468 <
469 < #ifndef IS_MPI
470 <
471 <  finalOut << nAtoms << "\n";
472 <
473 <  finalOut << finalTime << ";\t"
474 <           << entry_plug->Hmat[0][0] << "\t"
475 <           << entry_plug->Hmat[1][0] << "\t"
476 <           << entry_plug->Hmat[2][0] << ";\t"
477 <
478 <           << entry_plug->Hmat[0][1] << "\t"
479 <           << entry_plug->Hmat[1][1] << "\t"
480 <           << entry_plug->Hmat[2][1] << ";\t"
481 <
482 <           << entry_plug->Hmat[0][2] << "\t"
483 <           << entry_plug->Hmat[1][2] << "\t"
484 <           << entry_plug->Hmat[2][2] << ";";
485 <
486 <  //write out additional parameters, such as chi and eta
487 <  finalOut << entry_plug->the_integrator->getAdditionalParameters();
488 <  finalOut << endl;
489 <
490 <  for( i=0; i<nAtoms; i++ ){
491 <
492 <    atoms[i]->getPos(pos);
493 <    atoms[i]->getVel(vel);
494 <
495 <    sprintf( tempBuffer,
496 <             "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t",
497 <             atoms[i]->getType(),
498 <             pos[0],
499 <             pos[1],
500 <             pos[2],
501 <             vel[0],
502 <             vel[1],
503 <             vel[2]);
504 <    strcpy( writeLine, tempBuffer );
505 <
506 <    if( atoms[i]->isDirectional() ){
507 <
508 <      dAtom = (DirectionalAtom *)atoms[i];
509 <      dAtom->getQ( q );
510 <
511 <      sprintf( tempBuffer,
512 <               "%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\n",
513 <               q[0],
514 <               q[1],
515 <               q[2],
516 <               q[3],
517 <               dAtom->getJx(),
518 <               dAtom->getJy(),
519 <               dAtom->getJz());
520 <      strcat( writeLine, tempBuffer );
521 <    }
522 <    else
523 <      strcat( writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n" );
524 <
525 <    finalOut << writeLine;
526 <  }
527 <  finalOut.flush();
528 <  finalOut.close();
529 <
530 < #else // is_mpi
531 <
532 <  // first thing first, suspend fatalities.
533 <  painCave.isEventLoop = 1;
534 <
535 <  int myStatus; // 1 = wakeup & success; 0 = error; -1 = AllDone
536 <  int haveError;
537 <
538 <  MPI_Status istatus;
539 <  int *AtomToProcMap = mpiSim->getAtomToProcMap();
540 <
541 <  // write out header and node 0's coordinates
542 <
543 <  if( worldRank == 0 ){
544 <    finalOut << mpiSim->getTotAtoms() << "\n";
545 <
546 <    finalOut << finalTime << ";\t"
547 <            << entry_plug->Hmat[0][0] << "\t"
548 <            << entry_plug->Hmat[1][0] << "\t"
549 <            << entry_plug->Hmat[2][0] << ";\t"
550 <
551 <            << entry_plug->Hmat[0][1] << "\t"
552 <            << entry_plug->Hmat[1][1] << "\t"
553 <            << entry_plug->Hmat[2][1] << ";\t"
554 <
555 <            << entry_plug->Hmat[0][2] << "\t"
556 <            << entry_plug->Hmat[1][2] << "\t"
557 <            << entry_plug->Hmat[2][2] << ";";
558 <
559 <    finalOut << entry_plug->the_integrator->getAdditionalParameters();
560 <    finalOut << endl;
561 <    finalOut.flush();
562 <    for (i = 0 ; i < mpiSim->getTotAtoms(); i++ ) {
563 <      // Get the Node number which has this atom;
564 <
565 <      which_node = AtomToProcMap[i];
566 <
567 <      if (which_node != 0) {
568 <        
569 <        atomTypeTag          = 4*i;
570 <        atomIsDirectionalTag = 4*i + 1;
571 <        atomTransDataTag     = 4*i + 2;
572 <        atomOrientDataTag    = 4*i + 3;
573 <
574 <        MPI_Recv(MPIatomTypeString, MINIBUFFERSIZE, MPI_CHAR, which_node,
575 <                 atomTypeTag, MPI_COMM_WORLD, &istatus);
576 <        
577 <        strncpy(atomTypeString, MPIatomTypeString, MINIBUFFERSIZE);
578 <
579 <        MPI_Recv(&isDirectional, 1, MPI_INT, which_node,
580 <                 atomIsDirectionalTag, MPI_COMM_WORLD, &istatus);
581 <        
582 <        MPI_Recv(atomTransData, 6, MPI_DOUBLE, which_node,
583 <                 atomTransDataTag, MPI_COMM_WORLD, &istatus);
584 <
585 <        if (isDirectional) {
586 <
587 <          MPI_Recv(atomOrientData, 7, MPI_DOUBLE, which_node,
588 <                   atomOrientDataTag, MPI_COMM_WORLD, &istatus);
589 <
590 <        }
591 <
400 >              strcat( writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n" );
401 >        
402        } else {
403 <        
404 <        haveError = 0;
405 <        which_atom = i;
406 <        local_index=-1;
407 <
408 <        for (j=0; (j<mpiSim->getMyNlocal()) && (local_index < 0); j++) {
409 <          if (atoms[j]->getGlobalIndex() == which_atom) local_index = j;
410 <        }
411 <
412 <        if (local_index != -1) {
413 <
414 <          atomTypeString = atoms[local_index]->getType();
415 <
416 <          atoms[local_index]->getPos(pos);
417 <          atoms[local_index]->getVel(vel);
418 <
419 <          atomTransData[0] = pos[0];
610 <          atomTransData[1] = pos[1];
611 <          atomTransData[2] = pos[2];
612 <
613 <          atomTransData[3] = vel[0];
614 <          atomTransData[4] = vel[1];
615 <          atomTransData[5] = vel[2];
616 <          
617 <          isDirectional = 0;
618 <
619 <          if( atoms[local_index]->isDirectional() ){
620 <
621 <            isDirectional = 1;
622 <            
623 <            dAtom = (DirectionalAtom *)atoms[local_index];
624 <            dAtom->getQ( q );
625 <            
626 <            atomOrientData[0] = q[0];
627 <            atomOrientData[1] = q[1];
628 <            atomOrientData[2] = q[2];
629 <            atomOrientData[3] = q[3];
630 <
631 <            atomOrientData[4] = dAtom->getJx();
632 <            atomOrientData[5] = dAtom->getJy();
633 <            atomOrientData[6] = dAtom->getJz();
634 <          }
635 <
636 <        } else {
637 <          sprintf(painCave.errMsg,
638 <                  "Atom %d not found on processor %d\n",
639 <                  i, worldRank );
640 <          haveError= 1;
641 <          simError();
642 <        }
643 <
644 <        if(haveError) DieDieDie();
645 <                              
646 <        // If we've survived to here, format the line:
403 >        
404 >              sprintf( writeLine,
405 >                             "%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",
406 >                             atomTypeString,
407 >                             atomData13[0],
408 >                             atomData13[1],
409 >                             atomData13[2],
410 >                             atomData13[3],
411 >                             atomData13[4],
412 >                             atomData13[5],
413 >                             atomData13[6],
414 >                             atomData13[7],
415 >                             atomData13[8],
416 >                             atomData13[9],
417 >                             atomData13[10],
418 >                             atomData13[11],
419 >                             atomData13[12]);
420          
648 –        sprintf( tempBuffer,
649 –                 "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t",
650 –                 atomTypeString,
651 –                 atomTransData[0],
652 –                 atomTransData[1],
653 –                 atomTransData[2],
654 –                 atomTransData[3],
655 –                 atomTransData[4],
656 –                 atomTransData[5]);
657 –
658 –        strcpy( writeLine, tempBuffer );
659 –
660 –        if (isDirectional) {
661 –
662 –          sprintf( tempBuffer,
663 –                   "%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\n",
664 –                   atomOrientData[0],
665 –                   atomOrientData[1],
666 –                   atomOrientData[2],
667 –                   atomOrientData[3],
668 –                   atomOrientData[4],
669 –                   atomOrientData[5],
670 –                   atomOrientData[6]);
671 –          strcat( writeLine, tempBuffer );
672 –
673 –        } else {
674 –          strcat( writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n" );
675 –        }
676 –
677 –        finalOut << writeLine;
678 –        finalOut.flush();
421        }
422 +      
423 +      for(k = 0; k < outFile.size(); k++)
424 +        *outFile[k] << writeLine;
425      }
426 <
427 <    finalOut.flush();
426 >    
427 >    for(k = 0; k < outFile.size(); k++)
428 >      outFile[k]->flush();
429 >    
430      sprintf( checkPointMsg,
431               "Sucessfully took a dump.\n");
432 +
433      MPIcheckPoint();        
434 <    
434 >
435 >    delete[] potatoes;
436 >
437    } else {
438  
439      // worldRank != 0, so I'm a remote node.  
440 +
441 +    // Set my magic potato to 0:
442 +
443 +    myPotato = 0;
444 +    currentIndex = 0;
445      
446      for (i = 0 ; i < mpiSim->getTotAtoms(); i++ ) {
447        
# Line 694 | Line 449 | void DumpWriter::writeFinal(double finalTime){
449        
450        if (AtomToProcMap[i] == worldRank) {
451  
452 <        local_index=-1;
453 <        for (j=0; (j<mpiSim->getMyNlocal()) && (local_index < 0); j++) {
454 <          if (atoms[j]->getGlobalIndex() == which_atom) local_index = j;
452 >        if (myPotato + 3 >= MAXTAG) {
453 >
454 >          // The potato was going to exceed the maximum value,
455 >          // so wrap this processor potato back to 0 (and block until
456 >          // node 0 says we can go:
457 >
458 >          MPI_Recv(&myPotato, 1, MPI_INT, 0, 0, MPI_COMM_WORLD, &istatus);
459 >          
460          }
461 <        if (local_index != -1) {
461 >        which_atom = i;
462 >        local_index = indexArray[currentIndex].first;        
463 >                
464 >        if (which_atom == indexArray[currentIndex].second) {
465          
466            atomTypeString = atoms[local_index]->getType();
467  
468 <          atoms[local_index]->getPos(pos);
469 <          atoms[local_index]->getVel(vel);
468 >                atoms[local_index]->getPos(pos);
469 >                atoms[local_index]->getVel(vel);
470  
471 <          atomTransData[0] = pos[0];
472 <          atomTransData[1] = pos[1];
473 <          atomTransData[2] = pos[2];
471 >          atomData6[0] = pos[0];
472 >          atomData6[1] = pos[1];
473 >          atomData6[2] = pos[2];
474  
475 <          atomTransData[3] = vel[0];
476 <          atomTransData[4] = vel[1];
477 <          atomTransData[5] = vel[2];
475 >          atomData6[3] = vel[0];
476 >          atomData6[4] = vel[1];
477 >          atomData6[5] = vel[2];
478            
479            isDirectional = 0;
480  
# Line 722 | Line 485 | void DumpWriter::writeFinal(double finalTime){
485              dAtom = (DirectionalAtom *)atoms[local_index];
486              dAtom->getQ( q );
487              
488 <            atomOrientData[0] = q[0];
489 <            atomOrientData[1] = q[1];
490 <            atomOrientData[2] = q[2];
491 <            atomOrientData[3] = q[3];
492 <
493 <            atomOrientData[4] = dAtom->getJx();
494 <            atomOrientData[5] = dAtom->getJy();
495 <            atomOrientData[6] = dAtom->getJz();
488 >            for (int j = 0; j < 6 ; j++)
489 >              atomData13[j] = atomData6[j];
490 >            
491 >            atomData13[6] = q[0];
492 >            atomData13[7] = q[1];
493 >            atomData13[8] = q[2];
494 >            atomData13[9] = q[3];
495 >  
496 >            atomData13[10] = dAtom->getJx();
497 >            atomData13[11] = dAtom->getJy();
498 >            atomData13[12] = dAtom->getJz();
499            }
500  
501          } else {
502 <          sprintf(painCave.errMsg,
503 <                  "Atom %d not found on processor %d\n",
504 <                  i, worldRank );
505 <          haveError= 1;
506 <          simError();
507 <        }
502 >                sprintf(painCave.errMsg,
503 >                              "Atom %d not found on processor %d\n",
504 >                              i, worldRank );
505 >                haveError= 1;
506 >                simError();
507 >              }
508  
743 –        // I've survived this far, so send off the data!
744 –
745 –        atomTypeTag          = 4*i;
746 –        atomIsDirectionalTag = 4*i + 1;
747 –        atomTransDataTag     = 4*i + 2;
748 –        atomOrientDataTag    = 4*i + 3;
749 –
509          strncpy(MPIatomTypeString, atomTypeString, MINIBUFFERSIZE);
510  
511 +        // null terminate the string before sending (just in case):
512 +        MPIatomTypeString[MINIBUFFERSIZE-1] = '\0';
513 +
514          MPI_Send(MPIatomTypeString, MINIBUFFERSIZE, MPI_CHAR, 0,
515 <                 atomTypeTag, MPI_COMM_WORLD);
515 >                             myPotato, MPI_COMM_WORLD);
516          
517 +        myPotato++;
518 +
519          MPI_Send(&isDirectional, 1, MPI_INT, 0,
520 <                 atomIsDirectionalTag, MPI_COMM_WORLD);
520 >                             myPotato, MPI_COMM_WORLD);
521          
522 <        MPI_Send(atomTransData, 6, MPI_DOUBLE, 0,
523 <                 atomTransDataTag, MPI_COMM_WORLD);
760 <
522 >        myPotato++;
523 >        
524          if (isDirectional) {
525  
526 <          MPI_Send(atomOrientData, 7, MPI_DOUBLE, 0,
527 <                   atomOrientDataTag, MPI_COMM_WORLD);
526 >          MPI_Send(atomData13, 13, MPI_DOUBLE, 0,
527 >                   myPotato, MPI_COMM_WORLD);
528            
529 +        } else {
530 +
531 +          MPI_Send(atomData6, 6, MPI_DOUBLE, 0,
532 +                   myPotato, MPI_COMM_WORLD);
533          }
534 <      
534 >
535 >        myPotato++;  
536 >        currentIndex++;    
537        }
538      }
539  
540      sprintf( checkPointMsg,
541 <             "Sucessfully wrote final file.\n");
541 >             "Sucessfully took a dump.\n");
542      MPIcheckPoint();        
543      
544 <  }
544 >  }
545    
777 –  painCave.isEventLoop = 0;
778 –
779 –  if( worldRank == 0 ) finalOut.close();
546   #endif // is_mpi
547   }
548  
783 –
784 –
549   #ifdef IS_MPI
550  
551   // a couple of functions to let us escape the write loop

Diff Legend

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