--- trunk/src/utils/StringUtils.cpp	2006/08/30 18:42:29	1024
+++ trunk/src/utils/StringUtils.cpp	2011/05/11 16:32:48	1558
@@ -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,12 +28,21 @@
  * 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]  Vardeman & Gezelter, in progress (2009).                        
  */
 
-#include <algorithm> 
+#include <algorithm>
 #include "utils/StringUtils.hpp"
 
-namespace oopse {
+namespace OpenMD {
   std::string UpperCase(const std::string& S) {
     std::string uc = S;
     unsigned int n = uc.size();
@@ -91,7 +91,7 @@ namespace oopse {
     return (str);
   }
 
-  int findBegin(std::istream &theStream, char* startText ){
+  int findBegin(std::istream &theStream, const char* startText ){
     const int MAXLEN = 1024;
     char readLine[MAXLEN];   
     int foundText = 0;
@@ -179,7 +179,7 @@ namespace oopse {
     return 0;
   }
   
-  std::string OOPSE_itoa(int value, unsigned int base) {    
+  std::string OpenMD_itoa(int value, unsigned int base) {    
     const char digitMap[] = "0123456789abcdef";	
     std::string buf;
 
@@ -218,22 +218,22 @@ namespace oopse {
     return str.substr(0, str.find('.'));
   }
 
-bool isInteger(const std::string& str) {
-
+  bool isInteger(const std::string& str) {
+    
     bool result = false;
-
+    
     std::string::const_iterator i = str.begin();    
     if (i != str.end() && (*i == '+' || *i == '-' || std::isdigit(*i) )) {
-        ++i;        
-        while (i != str.end() && std::isdigit(*i))
-            ++i;
-        if (i == str.end())
-            result = true;
+      ++i;        
+      while (i != str.end() && std::isdigit(*i))
+        ++i;
+      if (i == str.end())
+        result = true;
     }
     
     return result;
-}
-
+  }
+  
 bool CaseInsensitiveEquals(const char ch1, const char ch2) {
   return std::toupper((unsigned char)ch1) == std::toupper((unsigned char)ch2);
 }