ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/io/RestReader.cpp
(Generate patch)

Comparing trunk/src/io/RestReader.cpp (file contents):
Revision 423 by chrisfen, Thu Mar 10 19:11:02 2005 UTC vs.
Revision 507 by gezelter, Fri Apr 15 22:04:00 2005 UTC

# Line 68 | Line 68 | namespace oopse {
68   namespace oopse {
69    
70    RestReader::RestReader( SimInfo* info ) : info_(info){
71 <        
71 >    
72      idealName = "idealCrystal.in";
73      
74      isScanned = false;
# Line 92 | Line 92 | namespace oopse {
92              "File \"idealCrystal.in\" opened successfully for reading." );
93      MPIcheckPoint();
94   #endif
95 +
96      return;  
97    }
98    
# Line 225 | Line 226 | namespace oopse {
226  
227      nTotObjs = info_->getNGlobalIntegrableObjects();
228      haveError = 0;
229 <    
229 >
230      if (worldRank == masterNode) {
231        eof_test = fgets(read_buffer, sizeof(read_buffer), inIdealFile);
232        if( eof_test == NULL ){
# Line 258 | Line 259 | namespace oopse {
259          painCave.isFatal = 1;
260          simError();
261        }
262 <      
262 >
263        for (i=0 ; i < info_->getNGlobalMolecules(); i++) {
264          int which_node = info_->getMolToProc(i);
265          
# Line 269 | Line 270 | namespace oopse {
270            
271            if(mol == NULL) {
272              sprintf(painCave.errMsg,
273 <                   "RestReader Error: Molecule not found on node %d!\n",
274 <                   worldRank);
273 >                    "RestReader Error: Molecule not found on node %d!\n",
274 >                    worldRank);
275              painCave.isFatal = 1;
276              simError();
277            }
# Line 290 | Line 291 | namespace oopse {
291                painCave.isFatal = 1;
292                simError();
293              }
294 <            
295 <            parseIdealLine(read_buffer, integrableObjects[j]);
294 >        
295 >            parseIdealLine(read_buffer, integrableObject);
296 >        
297            }
298          } else {
299            //molecule belongs to slave nodes
# Line 374 | Line 376 | namespace oopse {
376      int nTokens;
377      
378      nTokens = tokenizer.countTokens();
379 <    
379 >
380      if (nTokens < 14) {
381        sprintf(painCave.errMsg,
382                "RestReader Error: Not enough Tokens.\n");
# Line 383 | Line 385 | namespace oopse {
385      }
386      
387      std::string name = tokenizer.nextToken();
388 <    
388 >
389      if (name != sd->getType()) {
390        
391        sprintf(painCave.errMsg,
# Line 398 | Line 400 | namespace oopse {
400      pos[0] = tokenizer.nextTokenAsDouble();
401      pos[1] = tokenizer.nextTokenAsDouble();
402      pos[2] = tokenizer.nextTokenAsDouble();
403 <    
403 >
404      // store the positions in the stuntdouble as generic data doubles
405      DoubleGenericData* refPosX = new DoubleGenericData();
406      refPosX->setID("refPosX");
407      refPosX->setData(pos[0]);
408      sd->addProperty(refPosX);
409 <    
409 >
410      DoubleGenericData* refPosY = new DoubleGenericData();
411      refPosY->setID("refPosY");
412      refPosY->setData(pos[1]);
# Line 414 | Line 416 | namespace oopse {
416      refPosZ->setID("refPosZ");
417      refPosZ->setData(pos[2]);
418      sd->addProperty(refPosZ);
419 <    
419 >
420      // we don't need the velocities
421      uselessToken = tokenizer.nextTokenAsDouble();
422      uselessToken = tokenizer.nextTokenAsDouble();

Diff Legend

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