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

Comparing trunk/OOPSE/libmdtools/DumpReader.cpp (file contents):
Revision 847 by mmeineke, Fri Oct 31 18:28:52 2003 UTC vs.
Revision 1074 by tim, Mon Mar 1 20:01:50 2004 UTC

# Line 33 | Line 33 | DumpReader :: DumpReader( char *in_name ){
33   using namespace dumpRead;
34  
35  
36 < DumpReader :: DumpReader( char *in_name ){
36 > DumpReader :: DumpReader(const char *in_name ){
37  
38    isScanned = false;
39    headFP = new FilePos;
# Line 226 | Line 226 | void DumpReader :: readSet( int whichFrame ){
226    
227    framePos = frameStart[whichFrame]->getPos();
228  
229 +  fsetpos(inFile, framePos);
230    
231  
231
232    eof_test = fgets(read_buffer, sizeof(read_buffer), inFile);
233    if( eof_test == NULL ){
234      sprintf( painCave.errMsg,
# Line 316 | Line 316 | void DumpReader :: readSet( int whichFrame ){
316    
317    haveError = 0;
318    if (worldRank == 0) {
319 <
319 >    fsetpos(inFile, framePos);
320      eof_test = fgets(read_buffer, sizeof(read_buffer), inFile);
321      if( eof_test == NULL ){
322        sprintf( painCave.errMsg,
# Line 497 | Line 497 | char* DumpReader::parseDumpLine(char* readLine, int gl
497    // set the string tokenizer
498    
499    foo = strtok(readLine, " ,;\t");
500 <  
500 >  atoms[atomIndex]->setType(foo);
501    // check the atom name to the current atom
502    
503 <  if( strcmp( foo, atoms[atomIndex]->getType() ) ){
504 <    sprintf( painCave.errMsg,
505 <             "Initialize from file error. Atom %s at index %d "
506 <             "in file %s does not"
507 <             " match the BASS atom %s.\n",
508 <             foo, atomIndex, inName, atoms[atomIndex]->getType() );
509 <    return strdup( painCave.errMsg );
510 <  }
503 >  //if( strcmp( foo, atoms[atomIndex]->getType() ) ){
504 >  //  sprintf( painCave.errMsg,
505 >  //    "Initialize from file error. Atom %s at index %d "
506 >  //     "in file %s does not"
507 >  //     " match the BASS atom %s.\n",
508 >  //     foo, atomIndex, inName, atoms[atomIndex]->getType() );
509 >  //  return strdup( painCave.errMsg );
510 >  //}
511      
512    // get the positions
513  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines