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 1118 by tim, Mon Apr 19 03:52:27 2004 UTC vs.
Revision 1119 by tim, Mon Apr 19 17:44:48 2004 UTC

# Line 112 | Line 112 | void DumpReader::scanFile( void ){
112        painCave.isFatal = 1;
113        simError();
114      }
115 –    framePos.push_back(currPos);
115  
116      while( !feof( inFile ) ){
117 +      
118 +      framePos.push_back(currPos);
119  
120        i = atoi(readBuffer);
121        
# Line 149 | Line 150 | void DumpReader::scanFile( void ){
150        currPos = new fpos_t;
151        fgetpos( inFile, currPos );
152        fgets( readBuffer, sizeof( readBuffer ), inFile );
152 –      framePos.push_back(currPos);
153        lineNum++;
154      }
155      
# Line 198 | Line 198 | void DumpReader :: readSet( int whichFrame ){
198    eof_test = fgets(read_buffer, sizeof(read_buffer), inFile);
199    if( eof_test == NULL ){
200      sprintf( painCave.errMsg,
201 <             "InitializeFromFile error: error reading 1st line of \"%s\"\n",
201 >             "DumpReader error: error reading 1st line of \"%s\"\n",
202               inFileName.c_str() );
203      painCave.isFatal = 1;
204      simError();
# Line 208 | Line 208 | void DumpReader :: readSet( int whichFrame ){
208  
209    if( nTotObjs != simnfo->getTotIntegrableObjects() ){
210      sprintf( painCave.errMsg,
211 <             "Initialize from File error. %s n_atoms, %d, "
211 >             "DumpReader error. %s n_atoms, %d, "
212               "does not match the BASS file's n_atoms, %d.\n",
213               inFileName.c_str(), nTotObjs, simnfo->getTotIntegrableObjects());
214      painCave.isFatal = 1;
# Line 293 | Line 293 | void DumpReader :: readSet( int whichFrame ){
293  
294      if( nTotObjs != simnfo->getTotIntegrableObjects()){
295        sprintf( painCave.errMsg,
296 <               "Initialize from File error. %s n_atoms, %d, "
296 >               "DumpReadererror. %s n_atoms, %d, "
297                 "does not match the BASS file's n_atoms, %d.\n",
298                 inFileName.c_str(), nTotObjs, simnfo->getTotIntegrableObjects());
299        haveError= 1;
# Line 456 | Line 456 | char* DumpReader::parseDumpLine(char* readLine, StuntD
456  
457    if( strcmp( foo, sd->getType() ) ){
458      sprintf( painCave.errMsg,
459 <             "Initialize from file error.  Does not"
459 >             "DumpReader error.  Does not"
460               " match the BASS atom %s.\n",
461               sd->getType() );
462      return strdup( painCave.errMsg );

Diff Legend

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