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

Comparing trunk/src/io/SectionParserManager.cpp (file contents):
Revision 541 by tim, Sun May 22 21:05:15 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   #include <algorithm>
42   #include <stack>
# Line 44 | Line 44
44   #include "utils/Trim.hpp"
45   #include "utils/simError.h"
46  
47 < namespace oopse {
47 > namespace OpenMD {
48  
49    SectionParserManager::~SectionParserManager() {
50      SectionParserManager::iterator i;
# Line 141 | Line 141 | namespace oopse {
141          input.clear();            
142          input.seekg(i->offset);
143          (i->sectionParser)->parse(input, ff, i->lineNo);
144 +        (i->sectionParser)->validateSection();
145        }
146      }
147      
# Line 150 | Line 151 | namespace oopse {
151      SectionParserManager::iterator i;
152      i = findSectionParser(sp->getSectionName());
153      if (i != sectionParsers_.end()) {
154 <      std::cerr << sp->getSectionName() << " section parser is alway existed"
154 >      std::cerr << sp->getSectionName() << " section parser already exists"
155        << std::endl;
156        return;
157      }
# Line 175 | Line 176 | namespace oopse {
176      SectionParserManager::iterator i;
177      i = findSectionParser(sp->getSectionName());
178      if (i != sectionParsers_.end()) {
179 <      std::cerr << sp->getSectionName() << " section parser is alway existed"
179 >      std::cerr << sp->getSectionName() << " section parser already exists"
180        << std::endl;
181        return;
182      }
# Line 200 | Line 201 | namespace oopse {
201      SectionParserManager::iterator i;
202      i = findSectionParser(sp->getSectionName());
203      if (i != sectionParsers_.end()) {
204 <      std::cerr << sp->getSectionName() << " section parser is already existed"
204 >      std::cerr << sp->getSectionName() << " section parser already exists"
205        << std::endl;
206      }
207  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines