--- trunk/OOPSE/libmdtools/ReadWrite.hpp 2003/10/28 16:20:28 830 +++ trunk/OOPSE/libmdtools/ReadWrite.hpp 2003/10/29 00:19:10 837 @@ -19,39 +19,39 @@ class FilePos{ using namespace std; class FilePos{ - + public: - FilePos(){ + FilePos(){ myPos = NULL; next = NULL; } - FilePos( fpos_t* thePos ) { - myPos = thePos; + FilePos( fpos_t* thePos ) { + myPos = thePos; next = NULL; } - ~FilePos(){ + ~FilePos(){ if( next != NULL ) delete next; if( myPos != NULL ) delete myPos; } - + void add( fpos_t *thePos ){ - if( next != NULL ) + if( next != NULL ) next->add( thePos ); else next = new FilePos( thePos ); } - + FilePos &operator=(fpos_t *thePos){ myPos = thePos; return *this; } - + void setPos( fpos_t *thePos ){ myPos = thePos; } fpos_t *getPos( void ){ return myPos; } - + FilePos* getNext( void ) { return next; } private: - + fpos_t *myPos; FilePos* next; - + }; class DumpWriter{ @@ -76,9 +76,9 @@ class StatWriter{ (public) ~StatWriter(); void writeStat( double currentTime ); - + private: - + SimInfo* entry_plug; ofstream outFile; char outName[500]; @@ -93,10 +93,10 @@ class InitializeFromFile{ (public) ~InitializeFromFile(); void readInit( SimInfo* the_entry_plug ); - + private: char* parseDumpLine(char* line, int atomIndex); - char* parseBoxLine(char* line, double boxMat[9], double &time ); + char* parseCommentLine(char* line, SimInfo* entry_plug); FILE *c_in_file; char c_in_name[500]; SimInfo* simnfo; @@ -123,7 +123,7 @@ class DumpReader{ (private) char inName[500]; bool isScanned; int nFrames; - + FilePos** frameStart; FilePos* headFP;