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 437 by chuckv, Fri Mar 28 22:34:02 2003 UTC vs.
Revision 1198 by tim, Thu May 27 00:48:12 2004 UTC

# Line 1 | Line 1
1 < #include <cstring>
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>
7 #include <mpi++.h>
12   #include "mpiSimulation.hpp"
13 < #define TAKE_THIS_TAG_CHAR 1
14 < #define TAKE_THIS_TAG_INT 2
13 >
14 > namespace dWrite{
15 >  void DieDieDie( void );
16 > }
17 >
18 > using namespace dWrite;
19   #endif //is_mpi
20  
21   #include "ReadWrite.hpp"
# Line 20 | Line 28 | DumpWriter::DumpWriter( SimInfo* the_entry_plug ){
28   #ifdef IS_MPI
29    if(worldRank == 0 ){
30   #endif // is_mpi
31 <    
32 <
33 <    
34 <    strcpy( outName, entry_plug->sampleName );
35 <    
28 <    outFile.open(outName, ios::out | ios::trunc );
29 <    
30 <    if( !outFile ){
31 <      
31 >
32 >    dumpFile.open(entry_plug->sampleName, ios::out | ios::trunc );
33 >
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      }
38  
39    //outFile.setf( ios::scientific );
42  
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 53 | 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 > /**
71 > * A hook function to load balancing
72 > */
73 >
74 > void DumpWriter::update(){
75 >  sortByGlobalIndex();          
76 > }
77    
78 <  const int BUFFERSIZE = 2000;
79 <  char tempBuffer[BUFFERSIZE];
80 <  char writeLine[BUFFERSIZE];
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, j, which_node, done, game_over, which_atom, local_index;
87 <  double q[4];
88 <  DirectionalAtom* dAtom;
89 <  int nAtoms = entry_plug->n_atoms;
90 <  Atom** atoms = entry_plug->atoms;
91 <    
86 > /**
87 > * Sorting the local index by global index
88 > */
89 >
90 > void DumpWriter::sortByGlobalIndex(){
91 >  Molecule* mols = entry_plug->molecules;  
92 >  indexArray.clear();
93 >  
94 >  for(int i = 0; i < entry_plug->n_mol;i++)
95 >    indexArray.push_back(make_pair(i, mols[i].getGlobalIndex()));
96 >  
97 >  sort(indexArray.begin(), indexArray.end(), indexSortingCriterion);    
98 > }
99  
100 < #ifndef IS_MPI
77 <    
78 <  outFile << nAtoms << "\n";
79 <    
80 <  outFile << currentTime << "\t"
81 <          << entry_plug->box_x << "\t"
82 <          << entry_plug->box_y << "\t"
83 <          << entry_plug->box_z << "\n";
84 <    
85 <  for( i=0; i<nAtoms; i++ ){
86 <      
100 > #endif
101  
102 <    sprintf( tempBuffer,
89 <             "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t",
90 <             atoms[i]->getType(),
91 <             atoms[i]->getX(),
92 <             atoms[i]->getY(),
93 <             atoms[i]->getZ(),
94 <             atoms[i]->get_vx(),
95 <             atoms[i]->get_vy(),
96 <             atoms[i]->get_vz());
97 <    strcpy( writeLine, tempBuffer );
102 > void DumpWriter::writeDump(double currentTime){
103  
104 <    if( atoms[i]->isDirectional() ){
105 <        
106 <      dAtom = (DirectionalAtom *)atoms[i];
107 <      dAtom->getQ( q );
108 <        
109 <      sprintf( tempBuffer,
110 <               "%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\n",
111 <               q[0],
112 <               q[1],
113 <               q[2],
114 <               q[3],
115 <               dAtom->getJx(),
116 <               dAtom->getJy(),
112 <               dAtom->getJz());
113 <      strcat( writeLine, tempBuffer );
104 >  ofstream finalOut;
105 >  vector<ofstream*> fileStreams;
106 >
107 > #ifdef IS_MPI
108 >  if(worldRank == 0 ){
109 > #endif    
110 >    finalOut.open( entry_plug->finalName, ios::out | ios::trunc );
111 >    if( !finalOut ){
112 >      sprintf( painCave.errMsg,
113 >               "Could not open \"%s\" for final dump output.\n",
114 >               entry_plug->finalName );
115 >      painCave.isFatal = 1;
116 >      simError();
117      }
118 <    else
116 <      strcat( writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n" );
117 <      
118 <    outFile << writeLine;
118 > #ifdef IS_MPI
119    }
120 <  outFile.flush();
120 > #endif // is_mpi
121  
122 < #else // is_mpi
122 >  fileStreams.push_back(&finalOut);
123 >  fileStreams.push_back(&dumpFile);
124  
125 <  MPI::Status istatus;
125 <  int *AtomToProcMap = mpiSim->getAtomToProcMap();
126 <  
127 <  // write out header and node 0's coordinates
128 <  
129 <  if( worldRank == 0 ){
130 <    outFile << mpiSim->getTotAtoms() << "\n";
131 <    
132 <    outFile << currentTime << "\t"
133 <            << entry_plug->box_x << "\t"
134 <            << entry_plug->box_y << "\t"
135 <            << entry_plug->box_z << "\n";
136 <    outFile.flush();
137 <    for (i = 0 ; i < mpiSim->getTotAtoms(); i++ ) {
138 <      // Get the Node number which has this atom;
139 <      
140 <      which_node = AtomToProcMap[i];    
141 <      
142 <      if (which_node == 0 ) {
143 <        
144 <        which_atom = i;
145 <        local_index=-1;        
146 <        for (j=0; (j<mpiSim->getMyNlocal()) && (local_index < 0); j++) {
147 <          if (atoms[j]->getGlobalIndex() == which_atom) local_index = j;
148 <        }
149 <        if (local_index != -1) {
150 <          //format the line
151 <          sprintf( tempBuffer,
152 <                   "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t",
153 <                   atoms[local_index]->getType(),
154 <                   atoms[local_index]->getX(),
155 <                   atoms[local_index]->getY(),
156 <                   atoms[local_index]->getZ(),
157 <                   atoms[local_index]->get_vx(),
158 <                   atoms[local_index]->get_vy(),
159 <                   atoms[local_index]->get_vz()); // check here.
160 <          strcpy( writeLine, tempBuffer );
161 <          
162 <          if( atoms[local_index]->isDirectional() ){
163 <            
164 <            dAtom = (DirectionalAtom *)atoms[local_index];
165 <            dAtom->getQ( q );
166 <            
167 <            sprintf( tempBuffer,
168 <                     "%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\n",
169 <                     q[0],
170 <                     q[1],
171 <                     q[2],
172 <                     q[3],
173 <                     dAtom->getJx(),
174 <                     dAtom->getJy(),
175 <                     dAtom->getJz());
176 <            strcat( writeLine, tempBuffer );
177 <            
178 <          }
179 <          else
180 <            strcat( writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n" );      
181 <        }
182 <        else {
183 <          strcpy( writeLine, "ATOM NOT FOUND ON THIS PROCESSOR");
184 <        }
185 <      }
186 <      else {
187 <        
188 <        //std::cerr << "node 0: sending node " << which_node << " request for atom " << i << "\n";
189 <        MPI::COMM_WORLD.Send(&i, 1, MPI_INT, which_node, TAKE_THIS_TAG_INT);
190 <        //std::cerr << "node 0: sent!\n";
191 <        MPI::COMM_WORLD.Recv(writeLine, BUFFERSIZE, MPI_CHAR, which_node,
192 <                             TAKE_THIS_TAG_CHAR, istatus);
193 <        //std::cerr << "node 0: got this line: " << writeLine;
194 <      }
195 <      
196 <      outFile << writeLine;
197 <      outFile.flush();
198 <    }
199 <    
200 <    // kill everyone off:
201 <    game_over = -1;
202 <    for (j = 0; j < mpiSim->getNumberProcessors(); j++) {      
203 <      MPI::COMM_WORLD.Send(&game_over, 1, MPI_INT, j, TAKE_THIS_TAG_INT);
204 <    }
125 >  writeFrame(fileStreams, currentTime);
126  
127 <  } else {
128 <    
129 <    done = 0;
130 <    while (!done) {
210 <      //std::cerr << "node: " << mpiSim->getMyNode() << " Waiting for receive \n";
211 <      MPI::COMM_WORLD.Recv(&which_atom, 1, MPI_INT, 0,
212 <                           TAKE_THIS_TAG_INT, istatus);
213 <      //std::cerr << "node: " << mpiSim->getMyNode() << " got request for atom " << which_atom << "\n";
214 <      if (which_atom == -1) {
215 <        done=1;
216 <        continue;
217 <      } else {
218 <        local_index=-1;        
219 <        for (j=0; (j<mpiSim->getMyNlocal()) && (local_index < 0); j++) {
220 <          if (atoms[j]->getGlobalIndex() == which_atom) local_index = j;
221 <        }
222 <        if (local_index != -1) {
223 <          //format the line
224 <          sprintf( tempBuffer,
225 <                   "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t",
226 <                   atoms[local_index]->getType(),
227 <                   atoms[local_index]->getX(),
228 <                   atoms[local_index]->getY(),
229 <                   atoms[local_index]->getZ(),
230 <                   atoms[local_index]->get_vx(),
231 <                   atoms[local_index]->get_vy(),
232 <                   atoms[local_index]->get_vz()); // check here.
233 <          strcpy( writeLine, tempBuffer );
234 <          
235 <          if( atoms[local_index]->isDirectional() ){
236 <            
237 <            dAtom = (DirectionalAtom *)atoms[local_index];
238 <            dAtom->getQ( q );
239 <            
240 <            sprintf( tempBuffer,
241 <                     "%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\n",
242 <                     q[0],
243 <                     q[1],
244 <                     q[2],
245 <                     q[3],
246 <                     dAtom->getJx(),
247 <                     dAtom->getJy(),
248 <                     dAtom->getJz());
249 <            strcat( writeLine, tempBuffer );
250 <          }
251 <          else
252 <            strcat( writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n" );
253 <          // std::cerr << "node: " << mpiSim->getMyNode() << " sending this line" << writeLine;
254 <          MPI::COMM_WORLD.Send(writeLine, BUFFERSIZE, MPI_CHAR, 0,
255 <                               TAKE_THIS_TAG_CHAR);
256 <        } else {
257 <          strcpy( writeLine, "ATOM NOT FOUND ON THIS PROCESSOR");
258 <          MPI::COMM_WORLD.Send(writeLine, BUFFERSIZE, MPI_CHAR, 0,
259 <                               TAKE_THIS_TAG_CHAR);
260 <        }
261 <      }
262 <    }
263 <  }  
264 <  outFile.flush();
265 <  sprintf( checkPointMsg,
266 <           "Sucessfully took a dump.\n");
267 <  MPIcheckPoint();
268 < #endif // is_mpi
127 > #ifdef IS_MPI
128 >  finalOut.close();
129 > #endif
130 >        
131   }
132  
133 < void DumpWriter::writeFinal(){
133 > void DumpWriter::writeFinal(double currentTime){
134  
273  char finalName[500];
135    ofstream finalOut;
136 +  vector<ofstream*> fileStreams;
137  
276  const int BUFFERSIZE = 2000;
277  char tempBuffer[BUFFERSIZE];
278  char writeLine[BUFFERSIZE];  
279
280  double q[4];
281  DirectionalAtom* dAtom;
282  int nAtoms = entry_plug->n_atoms;
283  Atom** atoms = entry_plug->atoms;
284  int i, j, which_node, done, game_over, which_atom, local_index;
285  
286  
138   #ifdef IS_MPI
139    if(worldRank == 0 ){
140   #endif // is_mpi
141 <    
142 <    strcpy( finalName, entry_plug->finalName );
143 <    
293 <    finalOut.open( finalName, ios::out | ios::trunc );
141 >
142 >    finalOut.open( entry_plug->finalName, ios::out | ios::trunc );
143 >
144      if( !finalOut ){
145        sprintf( painCave.errMsg,
146                 "Could not open \"%s\" for final dump output.\n",
147 <               finalName );
147 >               entry_plug->finalName );
148        painCave.isFatal = 1;
149        simError();
150      }
151 <    
302 <    // finalOut.setf( ios::scientific );
303 <    
151 >
152   #ifdef IS_MPI
153    }
154 + #endif // is_mpi
155    
156 <  sprintf(checkPointMsg,"Opened file for final configuration\n");
157 <  MPIcheckPoint();  
156 >  fileStreams.push_back(&finalOut);  
157 >  writeFrame(fileStreams, currentTime);
158 >
159 > #ifdef IS_MPI
160 >  finalOut.close();
161 > #endif
162    
163 < #endif //is_mpi
163 > }
164  
165 + void DumpWriter::writeFrame( vector<ofstream*>& outFile, double currentTime ){
166 +
167 +  const int BUFFERSIZE = 2000;
168 +  const int MINIBUFFERSIZE = 100;
169 +
170 +  char tempBuffer[BUFFERSIZE];  
171 +  char writeLine[BUFFERSIZE];
172 +
173 +  int i, k;
174 +
175 + #ifdef IS_MPI
176    
177 +  /*********************************************************************
178 +   * Documentation?  You want DOCUMENTATION?
179 +   *
180 +   * Why all the potatoes below?  
181 +   *
182 +   * To make a long story short, the original version of DumpWriter
183 +   * worked in the most inefficient way possible.  Node 0 would
184 +   * poke each of the node for an individual atom's formatted data
185 +   * as node 0 worked its way down the global index. This was particularly
186 +   * inefficient since the method blocked all processors at every atom
187 +   * (and did it twice!).
188 +   *
189 +   * An intermediate version of DumpWriter could be described from Node
190 +   * zero's perspective as follows:
191 +   *
192 +   *  1) Have 100 of your friends stand in a circle.
193 +   *  2) When you say go, have all of them start tossing potatoes at
194 +   *     you (one at a time).
195 +   *  3) Catch the potatoes.
196 +   *
197 +   * It was an improvement, but MPI has buffers and caches that could
198 +   * best be described in this analogy as "potato nets", so there's no
199 +   * need to block the processors atom-by-atom.
200 +   *
201 +   * This new and improved DumpWriter works in an even more efficient
202 +   * way:
203 +   *
204 +   *  1) Have 100 of your friend stand in a circle.
205 +   *  2) When you say go, have them start tossing 5-pound bags of
206 +   *     potatoes at you.
207 +   *  3) Once you've caught a friend's bag of potatoes,
208 +   *     toss them a spud to let them know they can toss another bag.
209 +   *
210 +   * How's THAT for documentation?
211 +   *
212 +   *********************************************************************/
213 +
214 +  int *potatoes;
215 +  int myPotato;
216 +
217 +  int nProc;
218 +  int j, which_node, done, which_atom, local_index, currentIndex;
219 +  double atomData[13];
220 +  int isDirectional;
221 +  char* atomTypeString;
222 +  char MPIatomTypeString[MINIBUFFERSIZE];
223 +  int nObjects;
224 +  int msgLen; // the length of message actually recieved at master nodes
225 + #endif //is_mpi
226 +
227 +  double q[4], ji[3];
228 +  DirectionalAtom* dAtom;
229 +  double pos[3], vel[3];
230 +  int nTotObjects;
231 +  StuntDouble* sd;
232 +  char* molName;
233 +  vector<StuntDouble*> integrableObjects;
234 +  vector<StuntDouble*>::iterator iter;
235 +  nTotObjects = entry_plug->getTotIntegrableObjects();
236   #ifndef IS_MPI
314    
315  finalOut << nAtoms << "\n";
316    
317  finalOut << entry_plug->box_x << "\t"
318           << entry_plug->box_y << "\t"
319           << entry_plug->box_z << "\n";
237    
238 <  for( i=0; i<nAtoms; i++ ){
239 <      
323 <    sprintf( tempBuffer,
324 <             "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t",
325 <             atoms[i]->getType(),
326 <             atoms[i]->getX(),
327 <             atoms[i]->getY(),
328 <             atoms[i]->getZ(),
329 <             atoms[i]->get_vx(),
330 <             atoms[i]->get_vy(),
331 <             atoms[i]->get_vz());
332 <    strcpy( writeLine, tempBuffer );
238 >  for(k = 0; k < outFile.size(); k++){
239 >    *outFile[k] << nTotObjects << "\n";
240  
241 <    if( atoms[i]->isDirectional() ){
242 <        
243 <      dAtom = (DirectionalAtom *)atoms[i];
244 <      dAtom->getQ( q );
245 <        
241 >    *outFile[k] << currentTime << ";\t"
242 >               << entry_plug->Hmat[0][0] << "\t"
243 >                     << entry_plug->Hmat[1][0] << "\t"
244 >                     << entry_plug->Hmat[2][0] << ";\t"
245 >              
246 >               << entry_plug->Hmat[0][1] << "\t"
247 >                     << entry_plug->Hmat[1][1] << "\t"
248 >                     << entry_plug->Hmat[2][1] << ";\t"
249 >
250 >                     << entry_plug->Hmat[0][2] << "\t"
251 >                     << entry_plug->Hmat[1][2] << "\t"
252 >                     << entry_plug->Hmat[2][2] << ";";
253 >
254 >    //write out additional parameters, such as chi and eta
255 >    *outFile[k] << entry_plug->the_integrator->getAdditionalParameters() << endl;
256 >  }
257 >  
258 >  for( i=0; i< entry_plug->n_mol; i++ ){
259 >
260 >    integrableObjects = entry_plug->molecules[i].getIntegrableObjects();
261 >    molName = (entry_plug->compStamps[entry_plug->molecules[i].getStampID()])->getID();
262 >    
263 >    for( iter = integrableObjects.begin();iter !=  integrableObjects.end(); ++iter){
264 >      sd = *iter;
265 >      sd->getPos(pos);
266 >      sd->getVel(vel);
267 >
268        sprintf( tempBuffer,
269 <               "%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\n",
270 <               q[0],
271 <               q[1],
272 <               q[2],
273 <               q[3],
274 <               dAtom->getJx(),
275 <               dAtom->getJy(),
276 <               dAtom->getJz());
277 <      strcat( writeLine, tempBuffer );
269 >             "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t",
270 >             sd->getType(),
271 >             pos[0],
272 >             pos[1],
273 >             pos[2],
274 >             vel[0],
275 >             vel[1],
276 >             vel[2]);
277 >      strcpy( writeLine, tempBuffer );
278 >
279 >      if( sd->isDirectional() ){
280 >
281 >        sd->getQ( q );
282 >        sd->getJ( ji );
283 >
284 >        sprintf( tempBuffer,
285 >               "%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\n",
286 >               q[0],
287 >               q[1],
288 >               q[2],
289 >               q[3],
290 >                 ji[0],
291 >                 ji[1],
292 >                 ji[2]);
293 >        strcat( writeLine, tempBuffer );
294 >      }
295 >      else
296 >        strcat( writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n" );
297      }
350    else
351      strcat( writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n" );
352      
353    finalOut << writeLine;
354  }
355  finalOut.flush();
356  finalOut.close();
298  
299 +    
300 +    for(k = 0; k < outFile.size(); k++)
301 +      *outFile[k] << writeLine;
302 + }
303 +
304   #else // is_mpi
305 +
306 +  /* code to find maximum tag value */
307    
308 <  MPI::Status istatus;
309 <  int *AtomToProcMap = mpiSim->getAtomToProcMap();
308 >  int *tagub, flag, MAXTAG;
309 >  MPI_Attr_get(MPI_COMM_WORLD, MPI_TAG_UB, &tagub, &flag);
310 >  if (flag) {
311 >    MAXTAG = *tagub;
312 >  } else {
313 >    MAXTAG = 32767;
314 >  }  
315  
316 +  int haveError;
317 +
318 +  MPI_Status istatus;
319 +  int nCurObj;
320 +  int *MolToProcMap = mpiSim->getMolToProcMap();
321 +
322    // write out header and node 0's coordinates
323 <  
323 >
324    if( worldRank == 0 ){
325 <    finalOut << mpiSim->getTotAtoms() << "\n";
325 >
326 >    // Node 0 needs a list of the magic potatoes for each processor;
327 >
328 >    nProc = mpiSim->getNprocessors();
329 >    potatoes = new int[nProc];
330 >
331 >    //write out the comment lines
332 >    for (i = 0; i < nProc; i++)
333 >      potatoes[i] = 0;
334      
335 <    finalOut << entry_plug->box_x << "\t"
336 <            << entry_plug->box_y << "\t"
337 <            << entry_plug->box_z << "\n";
338 <    
339 <    for (i = 0 ; i < mpiSim->getTotAtoms(); i++ ) {
340 <      // Get the Node number which has this molecule:
335 >      for(k = 0; k < outFile.size(); k++){
336 >        *outFile[k] << nTotObjects << "\n";
337 >
338 >        *outFile[k] << currentTime << ";\t"
339 >                         << entry_plug->Hmat[0][0] << "\t"
340 >                         << entry_plug->Hmat[1][0] << "\t"
341 >                         << entry_plug->Hmat[2][0] << ";\t"
342 >
343 >                         << entry_plug->Hmat[0][1] << "\t"
344 >                         << entry_plug->Hmat[1][1] << "\t"
345 >                         << entry_plug->Hmat[2][1] << ";\t"
346 >
347 >                         << entry_plug->Hmat[0][2] << "\t"
348 >                         << entry_plug->Hmat[1][2] << "\t"
349 >                         << entry_plug->Hmat[2][2] << ";";
350 >  
351 >        *outFile[k] << entry_plug->the_integrator->getAdditionalParameters() << endl;
352 >    }
353 >
354 >    currentIndex = 0;
355 >
356 >    for (i = 0 ; i < mpiSim->getTotNmol(); i++ ) {
357        
358 <      which_node = AtomToProcMap[i];    
358 >      // Get the Node number which has this atom;
359        
360 <      if (which_node == mpiSim->getMyNode()) {
360 >      which_node = MolToProcMap[i];
361 >      
362 >      if (which_node != 0) {
363 >        
364 >        if (potatoes[which_node] + 1 >= MAXTAG) {
365 >          // The potato was going to exceed the maximum value,
366 >          // so wrap this processor potato back to 0:        
367  
368 <        which_atom = i;
369 <        local_index=-1;        
370 <        for (j=0; (j<mpiSim->getMyNlocal()) && (local_index < 0); j++) {
382 <          if (atoms[j]->getGlobalIndex() == which_atom) local_index = j;
368 >          potatoes[which_node] = 0;          
369 >          MPI_Send(&potatoes[which_node], 1, MPI_INT, which_node, 0, MPI_COMM_WORLD);
370 >          
371          }
372 <        if (local_index != -1) {        
373 <          sprintf( tempBuffer,
374 <                   "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t",
375 <                   atoms[local_index]->getType(),
376 <                   atoms[local_index]->getX(),
377 <                   atoms[local_index]->getY(),
378 <                   atoms[local_index]->getZ(),
379 <                   atoms[local_index]->get_vx(),
380 <                   atoms[local_index]->get_vy(),
381 <                   atoms[local_index]->get_vz());
382 <          strcpy( writeLine, tempBuffer );
383 <          
384 <          if( atoms[local_index]->isDirectional() ){
385 <            
386 <            dAtom = (DirectionalAtom *)atoms[local_index];
387 <            dAtom->getQ( q );
388 <            
389 <            sprintf( tempBuffer,
390 <                     "%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\n",
391 <                     q[0],
392 <                     q[1],
393 <                     q[2],
394 <                     q[3],
395 <                     dAtom->getJx(),
396 <                     dAtom->getJy(),
397 <                     dAtom->getJz());
398 <            strcat( writeLine, tempBuffer );
399 <          }
400 <          else
401 <            strcat( writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n" );      
402 <        }
403 <        else {
404 <          strcpy( writeLine, "ATOM NOT FOUND ON THIS PROCESSOR");
405 <        }
406 <    
372 >
373 >        myPotato = potatoes[which_node];        
374 >
375 >        //recieve the number of integrableObject in current molecule
376 >        MPI_Recv(&nCurObj, 1, MPI_INT, which_node,
377 >                 myPotato, MPI_COMM_WORLD, &istatus);
378 >        myPotato++;
379 >        
380 >        for(int l = 0; l < nCurObj; l++){
381 >
382 >          if (potatoes[which_node] + 2 >= MAXTAG) {
383 >            // The potato was going to exceed the maximum value,
384 >            // so wrap this processor potato back to 0:        
385 >
386 >            potatoes[which_node] = 0;          
387 >            MPI_Send(&potatoes[which_node], 1, MPI_INT, which_node, 0, MPI_COMM_WORLD);
388 >            
389 >          }
390 >
391 >          MPI_Recv(MPIatomTypeString, MINIBUFFERSIZE, MPI_CHAR, which_node,
392 >          myPotato, MPI_COMM_WORLD, &istatus);
393 >
394 >          atomTypeString = MPIatomTypeString;
395 >
396 >          myPotato++;
397 >
398 >          MPI_Recv(atomData, 13, MPI_DOUBLE, which_node, myPotato, MPI_COMM_WORLD, &istatus);
399 >          myPotato++;
400 >
401 >          MPI_Get_count(&istatus, MPI_DOUBLE, &msgLen);
402 >
403 >          if(msgLen  == 13)
404 >            isDirectional = 1;
405 >          else
406 >            isDirectional = 0;
407 >            
408 >        }
409 >        potatoes[which_node] = myPotato;
410 >
411        } else {
412          
413 <        MPI::COMM_WORLD.Send(&i, 1, MPI_INT, which_node, TAKE_THIS_TAG_INT);
414 <        MPI::COMM_WORLD.Recv(writeLine, BUFFERSIZE, MPI_CHAR, which_node,
415 <                                TAKE_THIS_TAG_CHAR, istatus);
413 >        haveError = 0;
414 >        
415 >            local_index = indexArray[currentIndex].first;        
416 >
417 >        integrableObjects = (entry_plug->molecules[local_index]).getIntegrableObjects();
418 >
419 >        for(iter= integrableObjects.begin(); iter != integrableObjects.end(); ++iter){    
420 >                sd = *iter;
421 >            atomTypeString = sd->getType();
422 >            
423 >            sd->getPos(pos);
424 >            sd->getVel(vel);          
425 >          
426 >            atomData[0] = pos[0];
427 >            atomData[1] = pos[1];
428 >            atomData[2] = pos[2];
429 >
430 >            atomData[3] = vel[0];
431 >            atomData[4] = vel[1];
432 >            atomData[5] = vel[2];
433 >              
434 >            isDirectional = 0;
435 >
436 >            if( sd->isDirectional() ){
437 >
438 >              isDirectional = 1;
439 >                
440 >              sd->getQ( q );
441 >              sd->getJ( ji );
442 >
443 >              for (int j = 0; j < 6 ; j++)
444 >                atomData[j] = atomData[j];            
445 >              
446 >              atomData[6] = q[0];
447 >              atomData[7] = q[1];
448 >              atomData[8] = q[2];
449 >              atomData[9] = q[3];
450 >              
451 >              atomData[10] = ji[0];
452 >              atomData[11] = ji[1];
453 >              atomData[12] = ji[2];
454 >            }
455 >            
456 >        }
457 >        
458 >      currentIndex++;
459        }
460 +      // If we've survived to here, format the line:
461        
462 <      finalOut << writeLine;
462 >      if (!isDirectional) {
463 >        
464 >        sprintf( writeLine,
465 >                 "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t",
466 >                 atomTypeString,
467 >                 atomData[0],
468 >                 atomData[1],
469 >                 atomData[2],
470 >                 atomData[3],
471 >                 atomData[4],
472 >                 atomData[5]);
473 >        
474 >        strcat( writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n" );
475 >        
476 >      } else {
477 >        
478 >        sprintf( writeLine,
479 >                 "%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",
480 >                 atomTypeString,
481 >                 atomData[0],
482 >                 atomData[1],
483 >                 atomData[2],
484 >                 atomData[3],
485 >                 atomData[4],
486 >                 atomData[5],
487 >                 atomData[6],
488 >                 atomData[7],
489 >                 atomData[8],
490 >                 atomData[9],
491 >                 atomData[10],
492 >                 atomData[11],
493 >                 atomData[12]);
494 >        
495 >      }
496 >      
497 >      for(k = 0; k < outFile.size(); k++)
498 >        *outFile[k] << writeLine;
499      }
500      
501 <    // kill everyone off:
502 <    game_over = -1;
503 <    for (j = 0; j < mpiSim->getNumberProcessors(); j++) {
504 <      MPI::COMM_WORLD.Send(&game_over, 1, MPI_INT, j, TAKE_THIS_TAG_INT);
505 <    }
506 <
501 >    for(k = 0; k < outFile.size(); k++)
502 >      outFile[k]->flush();
503 >    
504 >    sprintf( checkPointMsg,
505 >             "Sucessfully took a dump.\n");
506 >    
507 >    MPIcheckPoint();        
508 >    
509 >    delete[] potatoes;
510 >    
511    } else {
512 +
513 +    // worldRank != 0, so I'm a remote node.  
514 +
515 +    // Set my magic potato to 0:
516 +
517 +    myPotato = 0;
518 +    currentIndex = 0;
519      
520 <    done = 0;
521 <    while (!done) {
522 <      MPI::COMM_WORLD.Recv(&which_atom, 1, MPI_INT, 0,
523 <                           TAKE_THIS_TAG_INT, istatus);
520 >    for (i = 0 ; i < mpiSim->getTotNmol(); i++ ) {
521 >      
522 >      // Am I the node which has this integrableObject?
523 >      
524 >      if (MolToProcMap[i] == worldRank) {
525  
442      if (which_atom == -1) {
443        done=1;
444        continue;
445      } else {
526  
527 <        local_index=-1;        
528 <        for (j=0; j < mpiSim->getMyNlocal(); j++) {
529 <          if (atoms[j]->getGlobalIndex() == which_atom) local_index = j;
527 >        if (myPotato + 1 >= MAXTAG) {
528 >          
529 >          // The potato was going to exceed the maximum value,
530 >          // so wrap this processor potato back to 0 (and block until
531 >          // node 0 says we can go:
532 >          
533 >          MPI_Recv(&myPotato, 1, MPI_INT, 0, 0, MPI_COMM_WORLD, &istatus);
534 >          
535          }
451        if (local_index != -1) {
536  
537 <          //format the line
538 <          sprintf( tempBuffer,
539 <                   "%s\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t",
540 <                   atoms[local_index]->getType(),
541 <                   atoms[local_index]->getX(),
542 <                   atoms[local_index]->getY(),
543 <                   atoms[local_index]->getZ(),
544 <                   atoms[local_index]->get_vx(),
545 <                   atoms[local_index]->get_vy(),
546 <                   atoms[local_index]->get_vz()); // check here.
547 <          strcpy( writeLine, tempBuffer );
548 <          
549 <          if( atoms[local_index]->isDirectional() ){
537 >          local_index = indexArray[currentIndex].first;        
538 >          integrableObjects = entry_plug->molecules[local_index].getIntegrableObjects();
539 >          
540 >          nCurObj = integrableObjects.size();
541 >                      
542 >          MPI_Send(&nCurObj, 1, MPI_INT, 0,
543 >                             myPotato, MPI_COMM_WORLD);
544 >          myPotato++;
545 >
546 >          for( iter = integrableObjects.begin(); iter  != integrableObjects.end(); iter++){
547 >
548 >            if (myPotato + 2 >= MAXTAG) {
549 >          
550 >              // The potato was going to exceed the maximum value,
551 >              // so wrap this processor potato back to 0 (and block until
552 >              // node 0 says we can go:
553 >          
554 >              MPI_Recv(&myPotato, 1, MPI_INT, 0, 0, MPI_COMM_WORLD, &istatus);
555 >              
556 >            }
557              
558 <            dAtom = (DirectionalAtom *)atoms[local_index];
559 <            dAtom->getQ( q );
560 <            
561 <            sprintf( tempBuffer,
562 <                     "%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\n",
563 <                     q[0],
564 <                     q[1],
565 <                     q[2],
566 <                     q[3],
567 <                     dAtom->getJx(),
568 <                     dAtom->getJy(),
569 <                     dAtom->getJz());
570 <            strcat( writeLine, tempBuffer );
558 >            sd = *iter;
559 >            
560 >            atomTypeString = sd->getType();
561 >
562 >            sd->getPos(pos);
563 >            sd->getVel(vel);
564 >
565 >            atomData[0] = pos[0];
566 >            atomData[1] = pos[1];
567 >            atomData[2] = pos[2];
568 >
569 >            atomData[3] = vel[0];
570 >            atomData[4] = vel[1];
571 >            atomData[5] = vel[2];
572 >              
573 >            isDirectional = 0;
574 >
575 >            if( sd->isDirectional() ){
576 >
577 >                isDirectional = 1;
578 >                
579 >                sd->getQ( q );
580 >                sd->getJ( ji );
581 >                
582 >                
583 >                atomData[6] = q[0];
584 >                atomData[7] = q[1];
585 >                atomData[8] = q[2];
586 >                atomData[9] = q[3];
587 >      
588 >                atomData[10] = ji[0];
589 >                atomData[11] = ji[1];
590 >                atomData[12] = ji[2];
591 >              }
592 >
593 >            
594 >            strncpy(MPIatomTypeString, atomTypeString, MINIBUFFERSIZE);
595 >
596 >            // null terminate the string before sending (just in case):
597 >            MPIatomTypeString[MINIBUFFERSIZE-1] = '\0';
598 >
599 >            MPI_Send(MPIatomTypeString, MINIBUFFERSIZE, MPI_CHAR, 0,
600 >                             myPotato, MPI_COMM_WORLD);
601 >            
602 >            myPotato++;
603 >            
604 >            if (isDirectional) {
605 >
606 >              MPI_Send(atomData, 13, MPI_DOUBLE, 0,
607 >                       myPotato, MPI_COMM_WORLD);
608 >              
609 >            } else {
610 >
611 >              MPI_Send(atomData, 6, MPI_DOUBLE, 0,
612 >                       myPotato, MPI_COMM_WORLD);
613 >            }
614 >
615 >            myPotato++;  
616 >
617            }
618 <          else
619 <            strcat( writeLine, "0.0\t0.0\t0.0\t0.0\t0.0\t0.0\t0.0\n" );
618 >
619 >          currentIndex++;    
620            
484          MPI::COMM_WORLD.Send(writeLine, BUFFERSIZE, MPI_CHAR, 0,
485                               TAKE_THIS_TAG_CHAR);
486        } else {
487          strcpy( writeLine, "ATOM NOT FOUND ON THIS PROCESSOR");
488          MPI::COMM_WORLD.Send(writeLine, BUFFERSIZE, MPI_CHAR, 0,
489                               TAKE_THIS_TAG_CHAR);
621          }
622 +      
623        }
624 +
625 +    sprintf( checkPointMsg,
626 +             "Sucessfully took a dump.\n");
627 +    MPIcheckPoint();                
628 +    
629      }
493  }
494  finalOut.flush();
495  sprintf( checkPointMsg,
496           "Sucessfully took a dump.\n");
497  MPIcheckPoint();
630  
631 <  if( worldRank == 0 ) finalOut.close();    
631 >
632 >  
633   #endif // is_mpi
634   }
635 +
636 + #ifdef IS_MPI
637 +
638 + // a couple of functions to let us escape the write loop
639 +
640 + void dWrite::DieDieDie( void ){
641 +
642 +  MPI_Finalize();
643 +  exit (0);
644 + }
645 +
646 + #endif //is_mpi

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines