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

Comparing trunk/src/io/DumpReader.hpp (file contents):
Revision 721 by chrisfen, Tue Nov 8 13:32:27 2005 UTC vs.
Revision 1360 by cli2, Mon Sep 7 16:31:51 2009 UTC

# Line 66 | Line 66 | namespace oopse {
66      DumpReader(SimInfo* info, const std::string & filename);
67      //DumpReader(SimInfo * info, istream & is);
68  
69 <    ~DumpReader();
69 >    virtual ~DumpReader();
70  
71      /** Returns the number of frames in the dump file*/
72      int getNFrames();
73  
74 +    void setNeedCOMprops(bool ncp) {
75 +      needCOMprops_ = ncp;
76 +    }
77          
78 <    void readFrame(int whichFrame);
78 >    virtual void readFrame(int whichFrame);
79  
80 <  private:
80 >  protected:
81  
82      void scanFile();
83  
84      void readSet(int whichFrame);
85  
86 <    void parseDumpLine(char *line, StuntDouble* integrableObject);
86 >    virtual void parseDumpLine(const std::string&);
87  
88 <    void parseCommentLine(char* line, Snapshot* s);
89 <
90 <
88 < #ifdef IS_MPI
89 <
90 <    void anonymousNodeDie(void);
91 <    void nodeZeroError(void);
92 <
93 < #endif                
94 <    // the maximum length of a typical MPI package is 15k
95 <    const static int maxBufferSize = 8192;
88 >    virtual void readFrameProperties(std::istream& inputStream);
89 >
90 >    void readStuntDoubles(std::istream& inputStream);                  
91          
92      SimInfo* info_;
93  
# Line 108 | Line 103 | namespace oopse {
103      bool needPos_;
104      bool needVel_;
105      bool needQuaternion_;
106 <    bool needAngMom_;
106 >    bool needAngMom_;
107 >    bool needCOMprops_;
108 >
109 >    const static int bufferSize = 4096;
110 >    char buffer[bufferSize];
111    };
112  
113   }      //end namespace oopse

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines