ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-4/src/io/DumpReader.cpp
(Generate patch)

Comparing trunk/OOPSE-4/src/io/DumpReader.cpp (file contents):
Revision 2420 by chrisfen, Tue Nov 8 13:32:27 2005 UTC vs.
Revision 3003 by gezelter, Fri Sep 8 16:13:21 2006 UTC

# Line 71 | Line 71 | namespace oopse {
71    
72    DumpReader::DumpReader(SimInfo* info, const std::string& filename)
73      : info_(info), filename_(filename), isScanned_(false), nframes_(0) {
74 <    
74 >    
75   #ifdef IS_MPI
76 <    
77 <      if (worldRank == 0) {
76 >    
77 >    if (worldRank == 0) {
78   #endif
79 <      
79 >      
80        inFile_ = new std::ifstream(filename_.c_str());
81 <      
82 <        if (inFile_->fail()) {
83 <          sprintf(painCave.errMsg, "DumpReader: Cannot open file: %s\n", filename_.c_str());
84 <          painCave.isFatal = 1;
85 <          simError();
86 <        }
87 <      
88 < #ifdef IS_MPI
89 <      
81 >      
82 >      if (inFile_->fail()) {
83 >        sprintf(painCave.errMsg,
84 >                "DumpReader: Cannot open file: %s\n",
85 >                filename_.c_str());
86 >        painCave.isFatal = 1;
87 >        simError();
88        }
89 <    
90 <      strcpy(checkPointMsg, "Dump file opened for reading successfully.");
91 <      MPIcheckPoint();
94 <    
95 < #endif
96 <    
97 <      return;
89 >      
90 > #ifdef IS_MPI
91 >      
92      }
93 <  
93 >    
94 >    strcpy(checkPointMsg, "Dump file opened for reading successfully.");
95 >    MPIcheckPoint();
96 >    
97 > #endif
98 >    
99 >    return;
100 >  }
101 >  
102    DumpReader::~DumpReader() {
103 <    
103 >    
104   #ifdef IS_MPI
105 <    
105 >    
106      if (worldRank == 0) {
107   #endif
108 <      
108 >      
109        delete inFile_;
110 <      
110 >      
111   #ifdef IS_MPI
112 <      
112 >      
113      }
114 <    
114 >    
115      strcpy(checkPointMsg, "Dump file closed successfully.");
116      MPIcheckPoint();
117 <    
117 >    
118   #endif
119 <    
119 >    
120      return;
121    }
122 <  
122 >  
123    int DumpReader::getNFrames(void) {
124      
125      if (!isScanned_)
# Line 127 | Line 129 | namespace oopse {
129    }
130    
131    void DumpReader::scanFile(void) {
132 <    int i, j;
133 <    int lineNum = 0;
132 <    char readBuffer[maxBufferSize];
132 >    int lineNo = 0;
133 >    std::streampos prevPos;
134      std::streampos  currPos;
135 <    
135 >    
136   #ifdef IS_MPI
137 <    
137 >    
138      if (worldRank == 0) {
139   #endif // is_mpi
140 <      
141 <      inFile_->seekg (0, std::ios::beg);
142 <      
143 <
144 <      currPos = inFile_->tellg();
145 <      inFile_->getline(readBuffer, sizeof(readBuffer));
146 <      lineNum++;
147 <      
148 <      if (inFile_->eof()) {
149 <        sprintf(painCave.errMsg,
150 <                "DumpReader Error: File \"%s\" ended unexpectedly at line %d\n",
151 <                filename_.c_str(),
151 <                lineNum);
152 <        painCave.isFatal = 1;
153 <        simError();
154 <      }
155 <      
156 <      while (!inFile_->eof()) {
157 <        framePos_.push_back(currPos);
158 <        
159 <        i = atoi(readBuffer);
160 <        
161 <        inFile_->getline(readBuffer, sizeof(readBuffer));
162 <        lineNum++;
163 <        
164 <        if (inFile_->eof()) {
165 <          sprintf(painCave.errMsg,
166 <                  "DumpReader Error: File \"%s\" ended unexpectedly at line %d\n",
167 <                  filename_.c_str(),
168 <                  lineNum);
169 <          painCave.isFatal = 1;
170 <          simError();
171 <        }
172 <        
173 <        for(j = 0; j < i; j++) {
174 <          inFile_->getline(readBuffer, sizeof(readBuffer));
175 <          lineNum++;
176 <          
177 <          if (inFile_->eof()) {
140 >      
141 >      currPos = inFile_->tellg();
142 >      prevPos = currPos;
143 >      bool foundOpenSnapshotTag = false;
144 >      bool foundClosedSnapshotTag = false;
145 >      while(inFile_->getline(buffer, bufferSize)) {
146 >        ++lineNo;
147 >        
148 >        std::string line = buffer;
149 >        currPos = inFile_->tellg();
150 >        if (line.find("<Snapshot>")!= std::string::npos) {
151 >          if (foundOpenSnapshotTag) {
152              sprintf(painCave.errMsg,
153 <                    "DumpReader Error: File \"%s\" ended unexpectedly at line %d,"
154 <                    " with atom %d\n", filename_.c_str(),
181 <                    lineNum,
182 <                    j);
183 <            
153 >                    "DumpReader:<Snapshot> is multiply nested at line %d in %s \n", lineNo,
154 >                    filename_.c_str());
155              painCave.isFatal = 1;
156 +            simError();          
157 +          }
158 +          foundOpenSnapshotTag = true;
159 +          foundClosedSnapshotTag = false;
160 +          framePos_.push_back(prevPos);
161 +          
162 +        } else if (line.find("</Snapshot>") != std::string::npos){
163 +          if (!foundOpenSnapshotTag) {
164 +            sprintf(painCave.errMsg,
165 +                    "DumpReader:</Snapshot> appears before <Snapshot> at line %d in %s \n", lineNo,
166 +                    filename_.c_str());
167 +            painCave.isFatal = 1;
168              simError();
169 <          }
170 <        }
171 <        
172 <        currPos = inFile_->tellg();
173 <        inFile_->getline(readBuffer, sizeof(readBuffer));
174 <        lineNum++;
175 <      }
176 <
177 <      inFile_->seekg (0, std::ios::beg);
178 <      
169 >          }
170 >          
171 >          if (foundClosedSnapshotTag) {
172 >            sprintf(painCave.errMsg,
173 >                    "DumpReader:</Snapshot> appears multiply nested at line %d in %s \n", lineNo,
174 >                    filename_.c_str());
175 >            painCave.isFatal = 1;
176 >            simError();
177 >          }
178 >          foundClosedSnapshotTag = true;
179 >          foundOpenSnapshotTag = false;
180 >        }
181 >        prevPos = currPos;
182 >      }
183 >      
184 >      // only found <Snapshot> for the last frame means the file is corrupted, we should discard
185 >      // it and give a warning message
186 >      if (foundOpenSnapshotTag) {
187 >        sprintf(painCave.errMsg,
188 >                "DumpReader: last frame in %s is invalid\n", filename_.c_str());
189 >        painCave.isFatal = 0;
190 >        simError();      
191 >        framePos_.pop_back();
192 >      }
193 >      
194        nframes_ = framePos_.size();
195 +      
196 +      if (nframes_ == 0) {
197 +        sprintf(painCave.errMsg,
198 +                "DumpReader: %s does not contain a valid frame\n", filename_.c_str());
199 +        painCave.isFatal = 1;
200 +        simError();      
201 +      }
202   #ifdef IS_MPI
203      }
204      
205      MPI_Bcast(&nframes_, 1, MPI_INT, 0, MPI_COMM_WORLD);
206 <    
202 <    strcpy(checkPointMsg, "Successfully scanned DumpFile\n");
203 <    MPIcheckPoint();
204 <    
206 >    
207   #endif // is_mpi
208 <    
208 >    
209      isScanned_ = true;
210    }
211    
# Line 240 | Line 242 | namespace oopse {
242      readSet(whichFrame);
243    }
244    
245 <  void DumpReader::readSet(int whichFrame) {
246 <    int i;
247 <    int nTotObjs;                  // the number of atoms
246 <    char read_buffer[maxBufferSize];  //the line buffer for reading
247 <    char * eof_test;               // ptr to see when we reach the end of the file
248 <    
249 <    Molecule* mol;
250 <    StuntDouble* integrableObject;
251 <    SimInfo::MoleculeIterator mi;
252 <    Molecule::IntegrableObjectIterator ii;
253 <    
245 >  void DumpReader::readSet(int whichFrame) {    
246 >    std::string line;
247 >
248   #ifndef IS_MPI
249 +
250      inFile_->clear();  
251      inFile_->seekg(framePos_[whichFrame]);
252 <        
253 <    if (!inFile_->getline(read_buffer, sizeof(read_buffer))) {
252 >
253 >    std::istream& inputStream = *inFile_;    
254 >
255 > #else
256 >    int masterNode = 0;
257 >    std::stringstream sstream;
258 >    if (worldRank == masterNode) {
259 >      std::string sendBuffer;
260 >
261 >      inFile_->clear();  
262 >      inFile_->seekg(framePos_[whichFrame]);
263 >      
264 >      while (inFile_->getline(buffer, bufferSize)) {
265 >
266 >        line = buffer;
267 >        sendBuffer += line;
268 >        sendBuffer += '\n';
269 >        if (line.find("</Snapshot>") != std::string::npos) {
270 >          break;
271 >        }        
272 >      }
273 >
274 >      int sendBufferSize = sendBuffer.size();
275 >      MPI_Bcast(&sendBufferSize, 1, MPI_INT, masterNode, MPI_COMM_WORLD);    
276 >      MPI_Bcast((void *)sendBuffer.c_str(), sendBufferSize, MPI_CHAR, masterNode, MPI_COMM_WORLD);    
277 >      
278 >      sstream.str(sendBuffer);
279 >    } else {
280 >      int sendBufferSize;
281 >      MPI_Bcast(&sendBufferSize, 1, MPI_INT, masterNode, MPI_COMM_WORLD);    
282 >      char * recvBuffer = new char[sendBufferSize+1];
283 >      MPI_Bcast(recvBuffer, sendBufferSize, MPI_CHAR, masterNode, MPI_COMM_WORLD);    
284 >      sstream.str(recvBuffer);
285 >    }      
286 >
287 >    std::istream& inputStream = sstream;  
288 > #endif
289 >
290 >    inputStream.getline(buffer, bufferSize);
291 >
292 >    line = buffer;
293 >    if (line.find("<Snapshot>") == std::string::npos) {
294        sprintf(painCave.errMsg,
295 <              "DumpReader error: error reading 1st line of \"%s\"\n",
261 <              filename_.c_str());
295 >              "DumpReader Error: can not find <Snapshot>\n");
296        painCave.isFatal = 1;
297        simError();
298      }
299 <    
300 <    nTotObjs = atoi(read_buffer);
301 <    
302 <    if (nTotObjs != info_->getNGlobalIntegrableObjects()) {
299 >    
300 >    //read frameData
301 >    readFrameProperties(inputStream);
302 >
303 >    //read StuntDoubles
304 >    readStuntDoubles(inputStream);    
305 >
306 >    inputStream.getline(buffer, bufferSize);
307 >    line = buffer;
308 >    if (line.find("</Snapshot>") == std::string::npos) {
309        sprintf(painCave.errMsg,
310 <              "DumpReader error. %s nIntegrable, %d, "
271 <              "does not match the meta-data file's nIntegrable, %d.\n",
272 <              filename_.c_str(),
273 <              nTotObjs,
274 <              info_->getNGlobalIntegrableObjects());
275 <      
310 >              "DumpReader Error: can not find </Snapshot>\n");
311        painCave.isFatal = 1;
312        simError();
313 <    }
314 <    
280 <    //read the box mat from the comment line
281 <    
282 <    
283 <    if (!inFile_->getline(read_buffer, sizeof(read_buffer))) {
284 <      sprintf(painCave.errMsg, "DumpReader Error: error in reading commment in %s\n",
285 <              filename_.c_str());
286 <      painCave.isFatal = 1;
287 <      simError();
288 <    }
289 <    
290 <    parseCommentLine(read_buffer, info_->getSnapshotManager()->getCurrentSnapshot());
291 <    
292 <    //parse dump lines
293 <    
294 <    i = 0;
295 <    for (mol = info_->beginMolecule(mi); mol != NULL; mol = info_->nextMolecule(mi)) {
296 <      
297 <      for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL;  
298 <           integrableObject = mol->nextIntegrableObject(ii)) {            
299 <        
300 <        
301 <        
302 <        if (!inFile_->getline(read_buffer, sizeof(read_buffer))) {
303 <          sprintf(painCave.errMsg,
304 <                  "DumpReader Error: error in reading file %s\n"
305 <                  "natoms  = %d; index = %d\n"
306 <                  "error reading the line from the file.\n",
307 <                  filename_.c_str(),
308 <                  nTotObjs,
309 <                  i);
310 <          
311 <          painCave.isFatal = 1;
312 <          simError();
313 <        }
314 <        
315 <        parseDumpLine(read_buffer, integrableObject);
316 <        i++;
317 <      }
318 <    }
319 <    
320 <    // MPI Section of code..........
321 <    
322 < #else //IS_MPI
323 <    
324 <    // first thing first, suspend fatalities.
325 <    int masterNode = 0;
326 <    int nCurObj;
327 <    painCave.isEventLoop = 1;
328 <    
329 <    int myStatus; // 1 = wakeup & success; 0 = error; -1 = AllDone
330 <    int haveError;
331 <    
332 <    MPI_Status istatus;
333 <    int nitems;
334 <    
335 <    nTotObjs = info_->getNGlobalIntegrableObjects();
336 <    haveError = 0;
337 <    
338 <    if (worldRank == masterNode) {
339 <      inFile_->clear();            
340 <      inFile_->seekg(framePos_[whichFrame]);
341 <      
342 <      if (!inFile_->getline(read_buffer, sizeof(read_buffer))) {
343 <        sprintf(painCave.errMsg, "DumpReader Error: Error reading 1st line of %s \n ",
344 <                filename_.c_str());
345 <        painCave.isFatal = 1;
346 <        simError();
347 <      }
348 <      
349 <      nitems = atoi(read_buffer);
350 <      
351 <      // Check to see that the number of integrable objects in the
352 <      // intial configuration file is the same as derived from the
353 <      // meta-data file.
354 <      
355 <      if (nTotObjs != nitems) {
356 <        sprintf(painCave.errMsg,
357 <                "DumpReader Error. %s nIntegrable, %d, "
358 <                "does not match the meta-data file's nIntegrable, %d.\n",
359 <                filename_.c_str(),
360 <                nTotObjs,
361 <                info_->getNGlobalIntegrableObjects());
362 <        
363 <        painCave.isFatal = 1;
364 <        simError();
365 <      }
366 <      
367 <      //read the boxMat from the comment line
368 <      
369 <      
370 <      
371 <      if (!inFile_->getline(read_buffer, sizeof(read_buffer))) {
372 <        sprintf(painCave.errMsg, "DumpReader Error: error in reading commment in %s\n",
373 <                filename_.c_str());
374 <        painCave.isFatal = 1;
375 <        simError();
376 <      }
377 <      
378 <      //Every single processor will parse the comment line by itself
379 <      //By using this way, we might lose some efficiency, but if we want to add
380 <      //more parameters into comment line, we only need to modify function
381 <      //parseCommentLine
382 <      
383 <      MPI_Bcast(read_buffer, maxBufferSize, MPI_CHAR, masterNode, MPI_COMM_WORLD);
384 <      parseCommentLine(read_buffer, info_->getSnapshotManager()->getCurrentSnapshot());
385 <      
386 <      for(i = 0; i < info_->getNGlobalMolecules(); i++) {
387 <        int which_node = info_->getMolToProc(i);
388 <        
389 <        if (which_node == masterNode) {
390 <          //molecules belong to master node
391 <          
392 <          mol = info_->getMoleculeByGlobalIndex(i);
393 <          
394 <          if (mol == NULL) {
395 <            sprintf(painCave.errMsg, "DumpReader Error: Molecule not found on node %d!", worldRank);
396 <            painCave.isFatal = 1;
397 <            simError();
398 <          }
399 <          
400 <          for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL;  
401 <               integrableObject = mol->nextIntegrableObject(ii)){
402 <            
403 <            
404 <            
405 <            if (!inFile_->getline(read_buffer, sizeof(read_buffer))) {
406 <              sprintf(painCave.errMsg,
407 <                      "DumpReader Error: error in reading file %s\n"
408 <                      "natoms  = %d; index = %d\n"
409 <                      "error reading the line from the file.\n",
410 <                      filename_.c_str(),
411 <                      nTotObjs,
412 <                      i);
413 <              
414 <              painCave.isFatal = 1;
415 <              simError();
416 <            }
417 <            
418 <            parseDumpLine(read_buffer, integrableObject);
419 <          }
420 <        } else {
421 <          //molecule belongs to slave nodes
422 <          
423 <          MPI_Recv(&nCurObj, 1, MPI_INT, which_node, TAKE_THIS_TAG_INT,
424 <                   MPI_COMM_WORLD, &istatus);
425 <          
426 <          for(int j = 0; j < nCurObj; j++) {
427 <            
428 <            
429 <            if (!inFile_->getline(read_buffer, sizeof(read_buffer))) {
430 <              sprintf(painCave.errMsg,
431 <                      "DumpReader Error: error in reading file %s\n"
432 <                      "natoms  = %d; index = %d\n"
433 <                      "error reading the line from the file.\n",
434 <                      filename_.c_str(),
435 <                      nTotObjs,
436 <                      i);
437 <              
438 <              painCave.isFatal = 1;
439 <              simError();
440 <            }
441 <            
442 <            MPI_Send(read_buffer, maxBufferSize, MPI_CHAR, which_node,
443 <                     TAKE_THIS_TAG_CHAR, MPI_COMM_WORLD);
444 <          }
445 <        }
446 <      }
447 <    } else {
448 <      //actions taken at slave nodes
449 <      MPI_Bcast(read_buffer, maxBufferSize, MPI_CHAR, masterNode, MPI_COMM_WORLD);
450 <      
451 <      /**@todo*/
452 <      parseCommentLine(read_buffer, info_->getSnapshotManager()->getCurrentSnapshot());
453 <      
454 <      for(i = 0; i < info_->getNGlobalMolecules(); i++) {
455 <        int which_node = info_->getMolToProc(i);
456 <        
457 <        if (which_node == worldRank) {
458 <          //molecule with global index i belongs to this processor
459 <          
460 <          mol = info_->getMoleculeByGlobalIndex(i);
461 <          if (mol == NULL) {
462 <            sprintf(painCave.errMsg, "DumpReader Error: Molecule not found on node %d!", worldRank);
463 <            painCave.isFatal = 1;
464 <            simError();
465 <          }
466 <          
467 <          nCurObj = mol->getNIntegrableObjects();
468 <          
469 <          MPI_Send(&nCurObj, 1, MPI_INT, masterNode, TAKE_THIS_TAG_INT,
470 <                   MPI_COMM_WORLD);
471 <          
472 <          for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL;  
473 <               integrableObject = mol->nextIntegrableObject(ii)){
474 <            
475 <            MPI_Recv(read_buffer, maxBufferSize, MPI_CHAR, masterNode,
476 <                     TAKE_THIS_TAG_CHAR, MPI_COMM_WORLD, &istatus);
477 <            
478 <            parseDumpLine(read_buffer, integrableObject);
479 <          }
480 <          
481 <        }
482 <        
483 <      }
484 <      
485 <    }
486 <    
487 < #endif
488 <    
313 >    }        
314 >  
315    }
316    
317 <  void DumpReader::parseDumpLine(char *line, StuntDouble *integrableObject) {
318 <    
319 <    Vector3d pos;  // position place holders
494 <    Vector3d vel;  // velocity placeholders
495 <    Quat4d q;    // the quaternions
496 <    Vector3d ji;   // angular velocity placeholders;
317 >  void DumpReader::parseDumpLine(const std::string& line) {
318 >
319 >      
320      StringTokenizer tokenizer(line);
321      int nTokens;
322      
323      nTokens = tokenizer.countTokens();
324      
325 <    if (nTokens < 14) {
325 >    if (nTokens < 2) {
326        sprintf(painCave.errMsg,
327 <              "DumpReader Error: Not enough Tokens.\n%s\n", line);
327 >              "DumpReader Error: Not enough Tokens.\n%s\n", line.c_str());
328        painCave.isFatal = 1;
329        simError();
330      }
331 +
332 +    int index = tokenizer.nextTokenAsInt();
333 +
334 +    StuntDouble* integrableObject = info_->getIOIndexToIntegrableObject(index);
335 +
336 +    if (integrableObject == NULL) {
337 +      return;
338 +    }
339 +    std::string type = tokenizer.nextToken();
340 +    int size = type.size();
341 +
342 +    for(int i = 0; i < size; ++i) {
343 +      switch(type[i]) {
344 +        
345 +        case 'p': {
346 +            Vector3d pos;
347 +            pos[0] = tokenizer.nextTokenAsDouble();
348 +            pos[1] = tokenizer.nextTokenAsDouble();
349 +            pos[2] = tokenizer.nextTokenAsDouble();
350 +            if (needPos_) {
351 +              integrableObject->setPos(pos);
352 +            }            
353 +            break;
354 +        }
355 +        case 'v' : {
356 +            Vector3d vel;
357 +            vel[0] = tokenizer.nextTokenAsDouble();
358 +            vel[1] = tokenizer.nextTokenAsDouble();
359 +            vel[2] = tokenizer.nextTokenAsDouble();
360 +            if (needVel_) {
361 +              integrableObject->setVel(vel);
362 +            }
363 +            break;
364 +        }
365 +
366 +        case 'q' : {
367 +           Quat4d q;
368 +           if (integrableObject->isDirectional()) {
369 +              
370 +             q[0] = tokenizer.nextTokenAsDouble();
371 +             q[1] = tokenizer.nextTokenAsDouble();
372 +             q[2] = tokenizer.nextTokenAsDouble();
373 +             q[3] = tokenizer.nextTokenAsDouble();
374 +              
375 +             RealType qlen = q.length();
376 +             if (qlen < oopse::epsilon) { //check quaternion is not equal to 0
377 +                
378 +               sprintf(painCave.errMsg,
379 +                       "DumpReader Error: initial quaternion error (q0^2 + q1^2 + q2^2 + q3^2) ~ 0\n");
380 +               painCave.isFatal = 1;
381 +               simError();
382 +                
383 +             }  
384 +              
385 +             q.normalize();
386 +             if (needQuaternion_) {            
387 +               integrableObject->setQ(q);
388 +             }              
389 +           }            
390 +           break;
391 +        }  
392 +        case 'j' : {
393 +          Vector3d ji;
394 +          if (integrableObject->isDirectional()) {
395 +             ji[0] = tokenizer.nextTokenAsDouble();
396 +             ji[1] = tokenizer.nextTokenAsDouble();
397 +             ji[2] = tokenizer.nextTokenAsDouble();
398 +             if (needAngMom_) {
399 +               integrableObject->setJ(ji);
400 +             }
401 +          }
402 +          break;
403 +        }  
404 +        case 'f': {
405 +
406 +          Vector3d force;
407 +          force[0] = tokenizer.nextTokenAsDouble();
408 +          force[1] = tokenizer.nextTokenAsDouble();
409 +          force[2] = tokenizer.nextTokenAsDouble();          
410 +          integrableObject->setFrc(force);
411 +          break;
412 +        }
413 +        case 't' : {
414 +
415 +           Vector3d torque;
416 +           torque[0] = tokenizer.nextTokenAsDouble();
417 +           torque[1] = tokenizer.nextTokenAsDouble();
418 +           torque[2] = tokenizer.nextTokenAsDouble();          
419 +           integrableObject->setTrq(torque);          
420 +           break;
421 +        }
422 +        default: {
423 +               sprintf(painCave.errMsg,
424 +                       "DumpReader Error: %s is an unrecognized type\n", type.c_str());
425 +               painCave.isFatal = 1;
426 +               simError();
427 +          break;  
428 +        }
429 +
430 +      }
431 +    }
432      
433 <    std::string name = tokenizer.nextToken();
434 <    
435 <    if (name != integrableObject->getType()) {
436 <      
433 >  }
434 >  
435 >
436 >  void  DumpReader::readStuntDoubles(std::istream& inputStream) {
437 >
438 >    inputStream.getline(buffer, bufferSize);
439 >    std::string line(buffer);
440 >    
441 >    if (line.find("<StuntDoubles>") == std::string::npos) {
442        sprintf(painCave.errMsg,
443 <              "DumpReader Error: Atom type [%s] in %s does not match Atom Type [%s] in .md file.\n",
515 <              name.c_str(), filename_.c_str(), integrableObject->getType().c_str());
443 >              "DumpReader Error: Missing <StuntDoubles>\n");
444        painCave.isFatal = 1;
445 <      simError();        
446 <    }
447 <    
448 <    pos[0] = tokenizer.nextTokenAsDouble();
449 <    pos[1] = tokenizer.nextTokenAsDouble();
450 <    pos[2] = tokenizer.nextTokenAsDouble();
451 <    if (needPos_) {
452 <      integrableObject->setPos(pos);
453 <    }
454 <    
455 <    vel[0] = tokenizer.nextTokenAsDouble();
456 <    vel[1] = tokenizer.nextTokenAsDouble();
457 <    vel[2] = tokenizer.nextTokenAsDouble();
458 <    if (needVel_) {
459 <      integrableObject->setVel(vel);
460 <    }
461 <    
462 <    if (integrableObject->isDirectional()) {
463 <      
464 <      q[0] = tokenizer.nextTokenAsDouble();
465 <      q[1] = tokenizer.nextTokenAsDouble();
466 <      q[2] = tokenizer.nextTokenAsDouble();
467 <      q[3] = tokenizer.nextTokenAsDouble();
468 <      
469 <      double qlen = q.length();
470 <      if (qlen < oopse::epsilon) { //check quaternion is not equal to 0
471 <        
445 >      simError();
446 >    }
447 >
448 >    while(inputStream.getline(buffer, bufferSize)) {
449 >      line = buffer;
450 >      
451 >      if(line.find("</StuntDoubles>") != std::string::npos) {
452 >        break;
453 >      }
454 >
455 >      parseDumpLine(line);
456 >    }
457 >  
458 >  }
459 >
460 >  void DumpReader::readFrameProperties(std::istream& inputStream) {
461 >
462 >    Snapshot* s = info_->getSnapshotManager()->getCurrentSnapshot();
463 >    inputStream.getline(buffer, bufferSize);
464 >    std::string line(buffer);
465 >
466 >    if (line.find("<FrameData>") == std::string::npos) {
467 >      sprintf(painCave.errMsg,
468 >              "DumpReader Error: Missing <FrameData>\n");
469 >      painCave.isFatal = 1;
470 >      simError();
471 >    }
472 >
473 >    while(inputStream.getline(buffer, bufferSize)) {
474 >      line = buffer;
475 >      
476 >      if(line.find("</FrameData>") != std::string::npos) {
477 >        break;
478 >      }
479 >      
480 >      StringTokenizer tokenizer(line, " ;\t\n\r{}:,");
481 >      if (!tokenizer.hasMoreTokens()) {
482          sprintf(painCave.errMsg,
483 <                "DumpReader Error: initial quaternion error (q0^2 + q1^2 + q2^2 + q3^2 ~ 0\n");
483 >                "DumpReader Error: Not enough Tokens.\n%s\n", line.c_str());
484          painCave.isFatal = 1;
485 <        simError();
486 <        
487 <      }  
488 <      
489 <      q.normalize();
490 <      if (needQuaternion_) {            
491 <        integrableObject->setQ(q);
492 <      }
493 <      
494 <      ji[0] = tokenizer.nextTokenAsDouble();
495 <      ji[1] = tokenizer.nextTokenAsDouble();
496 <      ji[2] = tokenizer.nextTokenAsDouble();
497 <      if (needAngMom_) {
498 <        integrableObject->setJ(ji);
499 <      }
500 <    }
501 <    
502 <  }
485 >        simError();      
486 >      }
487 >
488 >      std::string propertyName = tokenizer.nextToken();
489 >      if (propertyName == "Time") {
490 >        RealType currTime = tokenizer.nextTokenAsDouble();
491 >        s->setTime(currTime);
492 >      } else if (propertyName == "Hmat"){
493 >        Mat3x3d hmat;
494 >        hmat(0, 0) = tokenizer.nextTokenAsDouble();
495 >        hmat(0, 1) = tokenizer.nextTokenAsDouble();
496 >        hmat(0, 2) = tokenizer.nextTokenAsDouble();
497 >        hmat(1, 0) = tokenizer.nextTokenAsDouble();
498 >        hmat(1, 1) = tokenizer.nextTokenAsDouble();
499 >        hmat(1, 2) = tokenizer.nextTokenAsDouble();
500 >        hmat(2, 0) = tokenizer.nextTokenAsDouble();
501 >        hmat(2, 1) = tokenizer.nextTokenAsDouble();
502 >        hmat(2, 2) = tokenizer.nextTokenAsDouble();
503 >        s->setHmat(hmat);      
504 >      } else if (propertyName == "Thermostat") {
505 >        RealType chi = tokenizer.nextTokenAsDouble();
506 >        RealType integralOfChiDt = tokenizer.nextTokenAsDouble();
507 >        s->setChi(chi);
508 >        s->setIntegralOfChiDt(integralOfChiDt);        
509 >     } else if (propertyName == "Barostat") {
510 >        Mat3x3d eta;
511 >        eta(0, 0) = tokenizer.nextTokenAsDouble();
512 >        eta(0, 1) = tokenizer.nextTokenAsDouble();
513 >        eta(0, 2) = tokenizer.nextTokenAsDouble();
514 >        eta(1, 0) = tokenizer.nextTokenAsDouble();
515 >        eta(1, 1) = tokenizer.nextTokenAsDouble();
516 >        eta(1, 2) = tokenizer.nextTokenAsDouble();
517 >        eta(2, 0) = tokenizer.nextTokenAsDouble();
518 >        eta(2, 1) = tokenizer.nextTokenAsDouble();
519 >        eta(2, 2) = tokenizer.nextTokenAsDouble();
520 >        s->setEta(eta);
521 >      } else {
522 >        sprintf(painCave.errMsg,
523 >                "DumpReader Error: %s is an invalid property in <FrameData>\n", propertyName.c_str());
524 >        painCave.isFatal = 0;
525 >        simError();        
526 >      }
527 >      
528 >    }
529 >
530 >  }
531 >
532    
566 –  
567 –  void DumpReader::parseCommentLine(char* line, Snapshot* s) {
568 –    double currTime;
569 –    Mat3x3d hmat;
570 –    double chi;
571 –    double integralOfChiDt;
572 –    Mat3x3d eta;
573 –    
574 –    StringTokenizer tokenizer(line);
575 –    int nTokens;
576 –    
577 –    nTokens = tokenizer.countTokens();
578 –    
579 –    //comment line should at least contain 10 tokens: current time(1 token) and  h-matrix(9 tokens)
580 –    if (nTokens < 10) {
581 –      sprintf(painCave.errMsg,
582 –              "DumpReader Error: Not enough tokens in comment line: %s", line);
583 –      painCave.isFatal = 1;
584 –      simError();    
585 –    }
586 –    
587 –    //read current time
588 –    currTime = tokenizer.nextTokenAsDouble();
589 –    s->setTime(currTime);
590 –    
591 –    //read h-matrix
592 –    hmat(0, 0) = tokenizer.nextTokenAsDouble();
593 –    hmat(0, 1) = tokenizer.nextTokenAsDouble();
594 –    hmat(0, 2) = tokenizer.nextTokenAsDouble();
595 –    hmat(1, 0) = tokenizer.nextTokenAsDouble();
596 –    hmat(1, 1) = tokenizer.nextTokenAsDouble();
597 –    hmat(1, 2) = tokenizer.nextTokenAsDouble();
598 –    hmat(2, 0) = tokenizer.nextTokenAsDouble();
599 –    hmat(2, 1) = tokenizer.nextTokenAsDouble();
600 –    hmat(2, 2) = tokenizer.nextTokenAsDouble();
601 –    s->setHmat(hmat);
602 –    
603 –    //read chi and integralOfChidt, they should apprear in pair
604 –    if (tokenizer.countTokens() >= 2) {
605 –      chi = tokenizer.nextTokenAsDouble();
606 –      integralOfChiDt = tokenizer.nextTokenAsDouble();            
607 –      
608 –      s->setChi(chi);
609 –      s->setIntegralOfChiDt(integralOfChiDt);
610 –    }
611 –    
612 –    //read eta (eta is 3x3 matrix)
613 –    if (tokenizer.countTokens() >= 9) {
614 –      eta(0, 0) = tokenizer.nextTokenAsDouble();
615 –      eta(0, 1) = tokenizer.nextTokenAsDouble();
616 –      eta(0, 2) = tokenizer.nextTokenAsDouble();
617 –      eta(1, 0) = tokenizer.nextTokenAsDouble();
618 –      eta(1, 1) = tokenizer.nextTokenAsDouble();
619 –      eta(1, 2) = tokenizer.nextTokenAsDouble();
620 –      eta(2, 0) = tokenizer.nextTokenAsDouble();
621 –      eta(2, 1) = tokenizer.nextTokenAsDouble();
622 –      eta(2, 2) = tokenizer.nextTokenAsDouble();      
623 –      
624 –      s->setEta(eta);
625 –    }
626 –    
627 –    
628 –  }
629 –  
533   }//end namespace oopse

Diff Legend

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