# | 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 38 | Line 29 | |
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 | * | |
42 | – | * OptionSectionParser.cpp |
43 | – | * OOPSE-2.0 |
44 | – | * |
41 | * Created by Charles F. Vardeman II on 11/15/05. | |
42 | * @author Charles F. Vardeman II | |
43 | < | * @version $Id: OptionSectionParser.cpp,v 1.1 2005-11-16 21:37:41 chuckv Exp $ |
43 | > | * @version $Id: OptionSectionParser.cpp,v 1.4 2009-11-25 20:02:00 gezelter Exp $ |
44 | * | |
45 | */ | |
46 | ||
# | Line 52 | Line 48 | |
48 | #include "types/AtomType.hpp" | |
49 | #include "UseTheForce/ForceField.hpp" | |
50 | #include "utils/simError.h" | |
51 | < | namespace oopse { |
52 | < | |
53 | < | OptionSectionParser::OptionSectionParser() { |
54 | < | setSectionName("Options"); |
55 | < | DefineOptionalParameter(MixingRule, "standard"); |
60 | < | |
61 | < | |
51 | > | #include "utils/StringUtils.hpp" |
52 | > | namespace OpenMD { |
53 | > | |
54 | > | OptionSectionParser::OptionSectionParser(ForceFieldOptions& options) : options_(options) { |
55 | > | setSectionName("Options"); |
56 | } | |
57 | ||
58 | void OptionSectionParser::parseLine(ForceField& ff,const std::string& line, int lineNo){ | |
# | Line 66 | Line 60 | namespace oopse { | |
60 | StringTokenizer tokenizer(line); | |
61 | ||
62 | if (tokenizer.countTokens() >= 2) { | |
63 | < | std::string OptionName = tokenizer.nextToken(); |
64 | < | std::string OptionValue = tokenizer.nextToken(); |
63 | > | std::string optionName = tokenizer.nextToken(); |
64 | > | std::string optionValue = tokenizer.nextToken(); |
65 | ||
66 | + | options_.setData(optionName, optionValue); |
67 | ||
73 | – | |
68 | } else { | |
69 | sprintf(painCave.errMsg, "OptionSectionParser Error: Not enough tokens at line %d\n", | |
70 | lineNo); | |
# | Line 79 | Line 73 | namespace oopse { | |
73 | } | |
74 | ||
75 | } | |
82 | – | |
76 | ||
77 | < | } //end namespace oopse |
77 | > | void OptionSectionParser::validateSection() { |
78 | > | options_.validateOptions(); |
79 | > | } |
80 | > | |
81 | > | } //end namespace OpenMD |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |