--- trunk/src/utils/StringTokenizer.cpp 2005/12/02 15:38:03 770 +++ branches/development/src/utils/StringTokenizer.cpp 2011/11/22 20:38:56 1665 @@ -6,19 +6,10 @@ * redistribute this software in source and binary code form, provided * that the following conditions are met: * - * 1. Acknowledgement of the program authors must be made in any - * publication of scientific results based in part on use of the - * program. An acceptable form of acknowledgement is citation of - * the article in which the program was described (Matthew - * A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher - * J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented - * Parallel Simulation Engine for Molecular Dynamics," - * J. Comput. Chem. 26, pp. 252-271 (2005)) - * - * 2. Redistributions of source code must retain the above copyright + * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * - * 3. Redistributions in binary form must reproduce the above copyright + * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the * distribution. @@ -37,6 +28,16 @@ * arising out of the use of or inability to use software, even if the * University of Notre Dame has been advised of the possibility of * such damages. + * + * SUPPORT OPEN SCIENCE! If you use OpenMD or its source code in your + * research, please cite the appropriate papers when you publish your + * work. Good starting points are: + * + * [1] Meineke, et al., J. Comp. Chem. 26, 252-271 (2005). + * [2] Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006). + * [3] Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008). + * [4] Kuang & Gezelter, J. Chem. Phys. 133, 164101 (2010). + * [5] Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011). */ #include @@ -44,7 +45,7 @@ #include #include "utils/StringTokenizer.hpp" -namespace oopse { +namespace OpenMD { StringTokenizer::StringTokenizer(const std::string & str, const std::string & delim) @@ -174,7 +175,7 @@ namespace oopse { return (float) (atof(token.c_str())); } - double StringTokenizer::nextTokenAsDouble() { + RealType StringTokenizer::nextTokenAsDouble() { std::string token = nextToken(); convertFortranNumber(token); return atof(token.c_str()); @@ -221,5 +222,5 @@ namespace oopse { } } -}//end namespace oopse +}//end namespace OpenMD