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 246 by gezelter, Wed Jan 12 22:41:40 2005 UTC vs.
branches/development/src/io/DumpReader.hpp (file contents), Revision 1465 by chuckv, Fri Jul 9 23:08:25 2010 UTC

# Line 1 | Line 1
1 < /*
2 < * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
1 > /*
2 > * Copyright (c) 2009 The University of Notre Dame. All Rights Reserved.
3   *
4   * The University of Notre Dame grants you ("Licensee") a
5   * non-exclusive, royalty free, license to use, modify and
6   * redistribute this software in source and binary code form, provided
7   * that the following conditions are met:
8   *
9 < * 1. Acknowledgement of the program authors must be made in any
10 < *    publication of scientific results based in part on use of the
11 < *    program.  An acceptable form of acknowledgement is citation of
12 < *    the article in which the program was described (Matthew
13 < *    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
14 < *    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
15 < *    Parallel Simulation Engine for Molecular Dynamics,"
16 < *    J. Comput. Chem. 26, pp. 252-271 (2005))
17 < *
18 < * 2. Redistributions of source code must retain the above copyright
9 > * 1. Redistributions of source code must retain the above copyright
10   *    notice, this list of conditions and the following disclaimer.
11   *
12 < * 3. Redistributions in binary form must reproduce the above copyright
12 > * 2. Redistributions in binary form must reproduce the above copyright
13   *    notice, this list of conditions and the following disclaimer in the
14   *    documentation and/or other materials provided with the
15   *    distribution.
# Line 37 | Line 28
28   * arising out of the use of or inability to use software, even if the
29   * University of Notre Dame has been advised of the possibility of
30   * such damages.
31 + *
32 + * SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your
33 + * research, please cite the appropriate papers when you publish your
34 + * work.  Good starting points are:
35 + *                                                                      
36 + * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).            
37 + * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
38 + * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
39 + * [4]  Vardeman & Gezelter, in progress (2009).                        
40   */
41 +  
42 + /**
43 + * @file DumpReader.hpp
44 + * @author tlin
45 + * @date 11/15/2004
46 + * @time 09:25am
47 + * @version 2.0
48 + */
49  
50 < /**
51 <  * @file DumpReader.hpp
52 <  * @author tlin
53 <  * @date 11/15/2004
54 <  * @time 09:25am
55 <  * @version 2.0
56 <  */
50 > #ifndef IO_DUMPREADER_HPP
51 > #define IO_DUMPREADER_HPP
52 >
53 > #include <cstdio>
54 > #include <string>
55 > #include "brains/SimInfo.hpp"
56 > #include "primitives/StuntDouble.hpp"
57 > namespace OpenMD {
58 >
59 >  /**
60 >   * @class DumpReader DumpReader.hpp "io/DumpReader.hpp"
61 >   * @todo get rid of more junk code from DumpReader
62 >   */
63 >  class DumpReader {
64 >  public:
65 >
66 >    DumpReader(SimInfo* info, const std::string & filename);
67 >    //DumpReader(SimInfo * info, istream & is);
68 >
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 >    virtual void readFrame(int whichFrame);
79 >
80 >  protected:
81 >
82 >    void scanFile();
83 >
84 >    void readSet(int whichFrame);
85 >
86 >    virtual void parseDumpLine(const std::string&);
87 >
88 >    virtual void readFrameProperties(std::istream& inputStream);
89  
90 < #ifndef IO_DUMPREADER_HPP
91 < #define IO_DUMPREADER_HPP
90 >    void readStuntDoubles(std::istream& inputStream);                  
91 >        
92 >    SimInfo* info_;
93 >
94 >    std::string filename_;
95 >    bool isScanned_;
96 >
97 >    int nframes_;
98 >
99 >    std::istream* inFile_;
100 >    
101 >    std::vector<std::streampos> framePos_;
102 >
103 >    bool needPos_;
104 >    bool needVel_;
105 >    bool needQuaternion_;
106 >    bool needAngMom_;
107 >    bool needCOMprops_;
108  
109 < #include <cstdio>
110 < #include <string>
111 < #include "brains/SimInfo.hpp"
112 < #include "primitives/StuntDouble.hpp"
113 < namespace oopse {
114 <
115 < /**
60 < * @class DumpReader DumpReader.hpp "io/DumpReader.hpp"
61 < * @todo get rid of more junk code from DumpReader
62 < */
63 < class DumpReader {
64 <    public:
65 <
66 <        DumpReader(SimInfo* info, const std::string & filename);
67 <        //DumpReader(SimInfo * info, istream & is);
68 <
69 <        ~DumpReader();
70 <
71 <        /** Returns the number of frames in the dump file*/
72 <        int getNFrames();
73 <
74 <        
75 <        void readFrame(int whichFrame);
76 <
77 <    private:
78 <
79 <        void scanFile();
80 <
81 <        void readSet(int whichFrame);
82 <
83 <        void parseDumpLine(char *line, StuntDouble* integrableObject);
84 <
85 <        void parseCommentLine(char* line, Snapshot* s);
86 <
87 <
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;
96 <        
97 <        SimInfo* info_;
98 <
99 <        std::string filename_;
100 <        bool isScanned_;
101 <
102 <        int nframes_;
103 <
104 <        FILE* inFile_;
105 <        std::vector<fpos_t*> framePos_;
106 < };
107 <
108 < }      //end namespace oopse
109 <
110 < #endif //IO_DUMPREADER_HPP
109 >    const static int bufferSize = 4096;
110 >    char buffer[bufferSize];
111 >  };
112 >
113 > }      //end namespace OpenMD
114 >
115 > #endif //IO_DUMPREADER_HPP

Comparing:
trunk/src/io/DumpReader.hpp (property svn:keywords), Revision 246 by gezelter, Wed Jan 12 22:41:40 2005 UTC vs.
branches/development/src/io/DumpReader.hpp (property svn:keywords), Revision 1465 by chuckv, Fri Jul 9 23:08:25 2010 UTC

# Line 0 | Line 1
1 + Author Id Revision Date

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines