# | 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 | /** | |
# | Line 54 | Line 54 | |
54 | #include <list> | |
55 | #include <string> | |
56 | #include <vector> | |
57 | < | namespace oopse{ |
57 | > | #include "config.h" |
58 | > | namespace OpenMD{ |
59 | ||
60 | /** | |
61 | * @ class GenericData GenericData.hpp "utils/GenericData.hpp" | |
# | Line 148 | Line 149 | namespace oopse{ | |
149 | /** FloatGenericData is a generic data type contains a float variable */ | |
150 | typedef SimpleTypeData<float> FloatGenericData; | |
151 | ||
152 | < | /** DoubleGenericData is a generic data type contains a double variable */ |
153 | < | typedef SimpleTypeData<double> DoubleGenericData; |
152 | > | /** DoubleGenericData is a generic data type contains a RealType variable */ |
153 | > | typedef SimpleTypeData<RealType> DoubleGenericData; |
154 | ||
155 | /** | |
156 | * @typedef StringGenericData | |
# | Line 160 | Line 161 | namespace oopse{ | |
161 | * PropertyMap propMap; | |
162 | * GenericData* gdata; | |
163 | * | |
164 | < | * s->setData("OOPSE"); |
164 | > | * s->setData("OpenMD"); |
165 | * propMap->addProperty(s); | |
166 | * | |
167 | * gdata = propMap->getPropertyByName("MyStringGenericData"); | |
# | Line 217 | Line 218 | namespace oopse{ | |
218 | ||
219 | /** | |
220 | * @typedef IntVectorGenericData | |
221 | < | * A generic data type contains a std::vector<double> variable. |
221 | > | * A generic data type contains a std::vector<RealType> variable. |
222 | */ | |
223 | < | typedef VectorTypeData<double> DoubleVectorGenericData; |
223 | > | typedef VectorTypeData<RealType> DoubleVectorGenericData; |
224 | ||
225 | /** | |
226 | * @typedef StringVectorGenericData | |
# | Line 232 | Line 233 | namespace oopse{ | |
233 | * std::vector<std::string>::iterator iter; | |
234 | * | |
235 | * sv->push_back("Hello World"); | |
236 | < | * sv->push_back("OOPSE"); |
236 | > | * sv->push_back("OpenMD"); |
237 | * | |
238 | * propMap.addProperty(sv); | |
239 | * | |
# | Line 252 | Line 253 | namespace oopse{ | |
253 | typedef VectorTypeData<std::string> StringVectorGenericData; | |
254 | ||
255 | ||
256 | < | } // namespace oopse |
256 | > | } // namespace OpenMD |
257 | #endif //UTIL _GENERICDATA_HPP |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |