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

Comparing:
trunk/src/io/SectionParser.cpp (file contents), Revision 507 by gezelter, Fri Apr 15 22:04:00 2005 UTC vs.
branches/development/src/io/SectionParser.cpp (file contents), Revision 1665 by gezelter, Tue Nov 22 20:38:56 2011 UTC

# 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]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40 + * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
42  
43   #include "io/SectionParser.hpp"
44   #include "utils/Trim.hpp"
45 < namespace oopse {
45 > namespace OpenMD {
46  
47    void SectionParser::parse(std::istream& input, ForceField& ff, int lineNo) {
48      const int bufferSize = 65535;
# Line 51 | Line 52 | namespace oopse {
52        ++lineNo;
53        line = trimLeftCopy(buffer);
54        //a line begins with "//" is comment
55 +      // let's also call lines starting with # and ! as comments
56        if (isEndSection(line)) {
57 <        break;
58 <      } else if ( line.empty() || (line.size() >= 2 && line[0] == '/' && line[1] == '/')) {
59 <        continue;
57 >        break;
58 >      } else if ( line.empty() ||
59 >                  (line.size() >= 2 && line[0] == '/' && line[1] == '/') ||
60 >                  (line.size() >= 1 && line[0] == '#') ||
61 >                  (line.size() >= 1 && line[0] == '!') ) {
62 >        continue;
63        } else {
64 <        parseLine(ff, line, lineNo);
64 >        parseLine(ff, line, lineNo);
65        }
66      }
67    }
68 <
68 >  
69    bool SectionParser::isEndSection(const std::string& line) {
70      StringTokenizer tokenizer(line);
71 <
71 >    
72      if (tokenizer.countTokens() >= 2) {
73        std::string keyword = tokenizer.nextToken();
74 <
74 >      
75        if (keyword != "end"){
76 <        return false;
76 >        return false;
77        }
78 <
78 >      
79        std::string section = tokenizer.nextToken();
80        if (section == sectionName_) {
81 <        return true;
81 >        return true;
82        }else {
83 <        return false;
83 >        return false;
84        }
85 <        
85 >      
86      }else {
87        return false;
88      }
89 <        
89 >    
90    }
91  
92 < }//namespace oopse
92 > }//namespace OpenMD

Comparing:
trunk/src/io/SectionParser.cpp (property svn:keywords), Revision 507 by gezelter, Fri Apr 15 22:04:00 2005 UTC vs.
branches/development/src/io/SectionParser.cpp (property svn:keywords), Revision 1665 by gezelter, Tue Nov 22 20:38:56 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines