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

Comparing trunk/src/utils/StringTokenizer.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 <iostream>
# Line 44 | Line 44
44   #include <sstream>
45   #include "utils/StringTokenizer.hpp"
46  
47 < namespace oopse {
47 > namespace OpenMD {
48  
49  
50    StringTokenizer::StringTokenizer(const std::string & str, const std::string & delim)
# Line 174 | Line 174 | namespace oopse {
174      return (float) (atof(token.c_str()));
175    }
176  
177 <  double StringTokenizer::nextTokenAsDouble() {
177 >  RealType StringTokenizer::nextTokenAsDouble() {
178      std::string token = nextToken();
179      convertFortranNumber(token);
180      return atof(token.c_str());
# Line 205 | Line 205 | namespace oopse {
205      return result;    
206    }
207  
208 + std::vector<std::string>  StringTokenizer::getAllTokens() {
209 +    std::vector<std::string> tokens;
210 +    while (hasMoreTokens()) {
211 +        tokens.push_back(nextToken());
212 +    }
213 +    return tokens;
214 + }
215    void StringTokenizer::convertFortranNumber(std::string& fortranNumber) {
216      std::string::iterator i;
217      for(i = fortranNumber.begin(); i != fortranNumber.end(); ++i) {
# Line 214 | Line 221 | namespace oopse {
221      }
222    }
223  
224 < }//end namespace oopse
224 > }//end namespace OpenMD
225  

Diff Legend

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