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 2981 by chrisfen, Wed Jun 28 14:35:14 2006 UTC vs.
Revision 2982 by tim, Wed Aug 30 18:42:29 2006 UTC

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

Diff Legend

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