# | Line 1 | Line 1 | |
---|---|---|
1 | < | /* |
1 | > | /* |
2 | * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved. | |
3 | * | |
4 | * The University of Notre Dame grants you ("Licensee") a | |
# | Line 6 | Line 6 | |
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 | #ifndef IO_SECTIONPARSERMANAGER_HPP | |
# | Line 46 | Line 46 | |
46 | ||
47 | #include "io/SectionParser.hpp" | |
48 | ||
49 | < | namespace oopse { |
49 | > | namespace OpenMD { |
50 | ||
51 | < | struct SectionParserContext { |
51 | > | struct SectionParserContext { |
52 | int priority; | |
53 | SectionParser* sectionParser; | |
54 | int lineNo; | |
55 | std::streampos offset; | |
56 | bool isActive; | |
57 | < | }; |
57 | > | }; |
58 | ||
59 | < | class SameSectionParserFunctor { |
60 | < | public: |
61 | < | SameSectionParserFunctor(const std::string section) : section_(section) {} |
59 | > | class SameSectionParserFunctor { |
60 | > | public: |
61 | > | SameSectionParserFunctor(const std::string section) : section_(section) {} |
62 | ||
63 | < | bool operator()(SectionParserContext context) { |
64 | < | return context.sectionParser->getSectionName() == section_; |
65 | < | } |
63 | > | bool operator()(SectionParserContext context) { |
64 | > | return context.sectionParser->getSectionName() == section_; |
65 | > | } |
66 | ||
67 | < | private: |
68 | < | std::string section_; |
69 | < | }; |
70 | < | /** |
71 | < | * @class SectionParserManager SectionParserManager.hpp "io/SectionParserManager.hpp" |
72 | < | * SectionParserManager maintains a priority list |
73 | < | */ |
74 | < | class SectionParserManager { |
67 | > | private: |
68 | > | std::string section_; |
69 | > | }; |
70 | > | /** |
71 | > | * @class SectionParserManager SectionParserManager.hpp "io/SectionParserManager.hpp" |
72 | > | * SectionParserManager maintains a priority list |
73 | > | */ |
74 | > | class SectionParserManager { |
75 | ||
76 | < | public: |
77 | < | typedef std::list<SectionParserContext> SectionParserContextList; |
78 | < | typedef SectionParserContextList::iterator iterator; |
79 | < | typedef SectionParserContextList::const_iterator const_iterator; |
76 | > | public: |
77 | > | typedef std::list<SectionParserContext> SectionParserContextList; |
78 | > | typedef SectionParserContextList::iterator iterator; |
79 | > | typedef SectionParserContextList::const_iterator const_iterator; |
80 | ||
81 | < | SectionParserManager() : beginPriority_(0), priorityDifference_(100) {} |
82 | < | ~SectionParserManager(); |
81 | > | SectionParserManager() : beginPriority_(0), priorityDifference_(100) {} |
82 | > | ~SectionParserManager(); |
83 | ||
84 | < | void parse(std::istream& input, ForceField& ff); |
84 | > | void parse(std::istream& input, ForceField& ff); |
85 | ||
86 | < | void push_front(SectionParser* sp); |
86 | > | void push_front(SectionParser* sp); |
87 | ||
88 | < | void push_back(SectionParser* sp); |
88 | > | void push_back(SectionParser* sp); |
89 | ||
90 | < | void insert(SectionParser* sp, int priority); |
90 | > | void insert(SectionParser* sp, int priority); |
91 | ||
92 | < | const_iterator begin() const { |
93 | < | return sectionParsers_.begin(); |
94 | < | } |
92 | > | const_iterator begin() const { |
93 | > | return sectionParsers_.begin(); |
94 | > | } |
95 | ||
96 | < | const_iterator end() const{ |
97 | < | return sectionParsers_.end(); |
98 | < | } |
96 | > | const_iterator end() const{ |
97 | > | return sectionParsers_.end(); |
98 | > | } |
99 | ||
100 | < | private: |
101 | < | iterator findSectionParser(const std::string& sectionName); |
102 | < | const int beginPriority_; |
103 | < | int priorityDifference_; |
100 | > | private: |
101 | > | iterator findSectionParser(const std::string& sectionName); |
102 | > | const int beginPriority_; |
103 | > | int priorityDifference_; |
104 | ||
105 | < | SectionParserContextList sectionParsers_; |
106 | < | }; |
105 | > | SectionParserContextList sectionParsers_; |
106 | > | }; |
107 | ||
108 | } | |
109 | #endif //IO_SECTIONPARSERMANAGER_HPP |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |