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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines