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 929 by tim, Tue Jan 13 15:46:49 2004 UTC vs.
Revision 1078 by tim, Tue Mar 2 20:32:40 2004 UTC

# Line 1 | Line 1
1 + #define _LARGEFILE_SOURCE64
2   #define _FILE_OFFSET_BITS 64
3  
4   #include <string.h>
# Line 28 | Line 29 | DumpWriter::DumpWriter( SimInfo* the_entry_plug ){
29    if(worldRank == 0 ){
30   #endif // is_mpi
31  
31 –
32      dumpFile.open(entry_plug->sampleName, ios::out | ios::trunc );
33  
34      if( !dumpFile ){
# Line 40 | Line 40 | DumpWriter::DumpWriter( SimInfo* the_entry_plug ){
40        simError();
41      }
42  
43 –    //outFile.setf( ios::scientific );
44 –
43   #ifdef IS_MPI
44    }
45  
# Line 94 | Line 92 | void DumpWriter::sortByGlobalIndex(){
92    
93    indexArray.clear();
94    
95 <  for(int i = 0; i < mpiSim->getMyNlocal();i++)
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   #endif
102  
103   void DumpWriter::writeDump(double currentTime){
105 –  
106 – // write to eor file
107 –  writeFinal(currentTime);
104  
105 < //write to dump file
106 <  writeFrame(dumpFile, currentTime);
105 >  ofstream finalOut;
106 >  vector<ofstream*> fileStreams;
107 >
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 > #ifdef IS_MPI
120 >  }
121 > #endif // is_mpi
122 >
123 >  fileStreams.push_back(&finalOut);
124 >  fileStreams.push_back(&dumpFile);
125 >
126 >  writeFrame(fileStreams, currentTime);
127 >
128 > #ifdef IS_MPI
129 >  finalOut.close();
130 > #endif
131          
132   }
133  
134   void DumpWriter::writeFinal(double currentTime){
135  
136 <  ofstream finalOut;    
137 <  
138 <  //Open eor file
136 >  ofstream finalOut;
137 >  vector<ofstream*> fileStreams;
138 >
139   #ifdef IS_MPI
140    if(worldRank == 0 ){
141   #endif // is_mpi
142  
143      finalOut.open( entry_plug->finalName, ios::out | ios::trunc );
144 +
145      if( !finalOut ){
146        sprintf( painCave.errMsg,
147                 "Could not open \"%s\" for final dump output.\n",
# Line 128 | Line 149 | void DumpWriter::writeFinal(double currentTime){
149        painCave.isFatal = 1;
150        simError();
151      }
152 <    
152 >
153   #ifdef IS_MPI
154    }
134 – #endif
135 –  
136 –  //write to eor file  
137 –  writeFrame(finalOut, currentTime);
138 –  
139 –  //close eor file      
140 – #ifdef IS_MPI
141 –  if(worldRank == 0 ){
142 –    finalOut.close();
143 –  }
155   #endif // is_mpi
156 +  
157 +  fileStreams.push_back(&finalOut);  
158 +  writeFrame(fileStreams, currentTime);
159  
160 + #ifdef IS_MPI
161 +  finalOut.close();
162 + #endif
163 +  
164   }
165  
166 < void DumpWriter::writeFrame( ofstream& outFile, double currentTime ){
166 > void DumpWriter::writeFrame( vector<ofstream*>& outFile, double currentTime ){
167  
168    const int BUFFERSIZE = 2000;
169    const int MINIBUFFERSIZE = 100;
170  
171 <  char tempBuffer[BUFFERSIZE];
171 >  char tempBuffer[BUFFERSIZE];  
172    char writeLine[BUFFERSIZE];
173  
174 <  int i;
174 >  int i, k;
175  
176   #ifdef IS_MPI
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  
# Line 178 | Line 233 | void DumpWriter::writeFrame( ofstream& outFile, double
233    double pos[3], vel[3];
234  
235   #ifndef IS_MPI
236 +  
237 +  for(k = 0; k < outFile.size(); k++){
238 +    *outFile[k] << nAtoms << "\n";
239  
240 <  outFile << 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 <  outFile << currentTime << ";\t"
250 <          << entry_plug->Hmat[0][0] << "\t"
251 <          << entry_plug->Hmat[1][0] << "\t"
187 <          << entry_plug->Hmat[2][0] << ";\t"
188 <
189 <          << entry_plug->Hmat[0][1] << "\t"
190 <          << entry_plug->Hmat[1][1] << "\t"
191 <          << entry_plug->Hmat[2][1] << ";\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][2] << "\t"
254 <          << entry_plug->Hmat[1][2] << "\t"
255 <          << entry_plug->Hmat[2][2] << ";";
256 <  //write out additional parameters, such as chi and eta
197 <  outFile << entry_plug->the_integrator->getAdditionalParameters();
198 <  outFile << endl;
199 <
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 232 | Line 289 | void DumpWriter::writeFrame( ofstream& outFile, double
289      else
290        strcat( writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n" );
291  
292 <    outFile << writeLine;
292 >    for(k = 0; k < outFile.size(); k++)
293 >      *outFile[k] << writeLine;
294    }
295  
296   #else // is_mpi
# Line 261 | Line 319 | void DumpWriter::writeFrame( ofstream& outFile, double
319      nProc = mpiSim->getNumberProcessors();
320      potatoes = new int[nProc];
321  
322 +    //write out the comment lines
323      for (i = 0; i < nProc; i++)
324        potatoes[i] = 0;
325      
326 <    outFile << mpiSim->getTotAtoms() << "\n";
326 >      for(k = 0; k < outFile.size(); k++){
327 >        *outFile[k] << mpiSim->getTotAtoms() << "\n";
328  
329 <    outFile << currentTime << ";\t"
330 <            << entry_plug->Hmat[0][0] << "\t"
331 <            << entry_plug->Hmat[1][0] << "\t"
332 <            << entry_plug->Hmat[2][0] << ";\t"
329 >        *outFile[k] << currentTime << ";\t"
330 >                         << entry_plug->Hmat[0][0] << "\t"
331 >                         << entry_plug->Hmat[1][0] << "\t"
332 >                         << entry_plug->Hmat[2][0] << ";\t"
333  
334 <            << entry_plug->Hmat[0][1] << "\t"
335 <            << entry_plug->Hmat[1][1] << "\t"
336 <            << entry_plug->Hmat[2][1] << ";\t"
334 >                         << entry_plug->Hmat[0][1] << "\t"
335 >                         << entry_plug->Hmat[1][1] << "\t"
336 >                         << entry_plug->Hmat[2][1] << ";\t"
337  
338 <            << entry_plug->Hmat[0][2] << "\t"
339 <            << entry_plug->Hmat[1][2] << "\t"
340 <            << entry_plug->Hmat[2][2] << ";";
338 >                         << entry_plug->Hmat[0][2] << "\t"
339 >                         << entry_plug->Hmat[1][2] << "\t"
340 >                         << entry_plug->Hmat[2][2] << ";";
341 >  
342 >        *outFile[k] << entry_plug->the_integrator->getAdditionalParameters() << endl;
343 >    }
344  
282 –    outFile << entry_plug->the_integrator->getAdditionalParameters();
283 –    outFile << endl;
284 –    outFile.flush();
285 –    
345      currentIndex = 0;
346 +
347      for (i = 0 ; i < mpiSim->getTotAtoms(); i++ ) {
348        
349        // Get the Node number which has this atom;
# Line 328 | Line 388 | void DumpWriter::writeFrame( ofstream& outFile, double
388  
389        } else {
390          
391 <        haveError = 0;
391 >        haveError = 0;
392          which_atom = i;
393          
394 <        local_index = indexArray[currentIndex].first;        
335 <                
336 <        if (which_atom == indexArray[currentIndex].second) {
394 >          local_index = indexArray[currentIndex].first;        
395            
396 <          atomTypeString = atoms[local_index]->getType();
397 <
396 >          if (which_atom == indexArray[currentIndex].second) {
397 >            
398 >            atomTypeString = atoms[local_index]->getType();
399 >            
400            atoms[local_index]->getPos(pos);
401            atoms[local_index]->getVel(vel);          
402 <
402 >          
403            atomData6[0] = pos[0];
404            atomData6[1] = pos[1];
405            atomData6[2] = pos[2];
# Line 372 | Line 432 | void DumpWriter::writeFrame( ofstream& outFile, double
432            
433          } else {
434            sprintf(painCave.errMsg,
435 <                  "Atom %d not found on processor %d\n",
436 <                  i, worldRank );
435 >                  "Atom %d not found on processor %d, currentIndex = %d, local_index = %d\n",
436 >                  which_atom, worldRank, currentIndex, local_index );
437            haveError= 1;
438            simError();
439          }
440          
441 <        if(haveError) DieDieDie();
441 >        if(haveError) DieDieDie();
442          
443 <        currentIndex ++;
443 >        currentIndex++;
444        }
445        // If we've survived to here, format the line:
446        
447        if (!isDirectional) {
448          
449 <        sprintf( writeLine,
449 >        sprintf( writeLine,
450                   "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t",
451                   atomTypeString,
452                   atomData6[0],
# Line 395 | Line 455 | void DumpWriter::writeFrame( ofstream& outFile, double
455                   atomData6[3],
456                   atomData6[4],
457                   atomData6[5]);
458 <
458 >        
459          strcat( writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n" );
460          
461        } else {
# Line 419 | Line 479 | void DumpWriter::writeFrame( ofstream& outFile, double
479          
480        }
481        
482 <      outFile << writeLine;
482 >      for(k = 0; k < outFile.size(); k++)
483 >        *outFile[k] << writeLine;
484      }
485      
486 <
487 <    outFile.flush();
486 >    for(k = 0; k < outFile.size(); k++)
487 >      outFile[k]->flush();
488 >    
489      sprintf( checkPointMsg,
490               "Sucessfully took a dump.\n");
491 +    
492      MPIcheckPoint();        
493 +    
494      delete[] potatoes;
495 +    
496    } else {
497  
498      // worldRank != 0, so I'm a remote node.  
# Line 444 | Line 509 | void DumpWriter::writeFrame( ofstream& outFile, double
509        if (AtomToProcMap[i] == worldRank) {
510  
511          if (myPotato + 3 >= MAXTAG) {
512 <
512 >          
513            // The potato was going to exceed the maximum value,
514            // so wrap this processor potato back to 0 (and block until
515            // node 0 says we can go:
516 <
516 >          
517            MPI_Recv(&myPotato, 1, MPI_INT, 0, 0, MPI_COMM_WORLD, &istatus);
518            
519          }
520          which_atom = i;
521 <        local_index = indexArray[currentIndex].first;        
521 >
522 >        local_index = indexArray[currentIndex].first;        
523                  
524 <        if (which_atom == indexArray[currentIndex].second) {
524 >        if (which_atom == indexArray[currentIndex].second) {
525          
526            atomTypeString = atoms[local_index]->getType();
527 <
527 >          
528            atoms[local_index]->getPos(pos);
529            atoms[local_index]->getVel(vel);
530 <
530 >          
531            atomData6[0] = pos[0];
532            atomData6[1] = pos[1];
533            atomData6[2] = pos[2];
# Line 486 | Line 552 | void DumpWriter::writeFrame( ofstream& outFile, double
552              atomData13[7] = q[1];
553              atomData13[8] = q[2];
554              atomData13[9] = q[3];
555 <
555 >  
556              atomData13[10] = dAtom->getJx();
557              atomData13[11] = dAtom->getJy();
558              atomData13[12] = dAtom->getJz();
# Line 494 | Line 560 | void DumpWriter::writeFrame( ofstream& outFile, double
560  
561          } else {
562            sprintf(painCave.errMsg,
563 <                  "Atom %d not found on processor %d\n",
564 <                  i, worldRank );
563 >                  "Atom %d not found on processor %d, currentIndex = %d, local_index = %d\n",
564 >                  which_atom, worldRank, currentIndex, local_index );
565            haveError= 1;
566            simError();
567          }
568 <
568 >        
569          strncpy(MPIatomTypeString, atomTypeString, MINIBUFFERSIZE);
570  
571          // null terminate the string before sending (just in case):
572          MPIatomTypeString[MINIBUFFERSIZE-1] = '\0';
573  
574          MPI_Send(MPIatomTypeString, MINIBUFFERSIZE, MPI_CHAR, 0,
575 <                 myPotato, MPI_COMM_WORLD);
575 >                             myPotato, MPI_COMM_WORLD);
576          
577          myPotato++;
578  
579          MPI_Send(&isDirectional, 1, MPI_INT, 0,
580 <                 myPotato, MPI_COMM_WORLD);
580 >                             myPotato, MPI_COMM_WORLD);
581          
582          myPotato++;
583          

Diff Legend

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