--- trunk/src/brains/SimCreator.cpp	2008/10/22 20:01:49	1313
+++ trunk/src/brains/SimCreator.cpp	2010/05/10 17:28:26	1442
@@ -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,15 @@
  * 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).                        
  */
  
 /**
@@ -79,7 +79,7 @@
 #include "math/ParallelRandNumGen.hpp"
 #endif
 
-namespace oopse {
+namespace OpenMD {
   
   Globals* SimCreator::parseFile(std::istream& rawMetaDataStream, const std::string& filename, int startOfMetaDataBlock ){
     Globals* simParams = NULL;
@@ -214,7 +214,7 @@ namespace oopse {
       painCave.isFatal = 1;
       simError();        
     }
-    catch (OOPSEException& e) {
+    catch (OpenMDException& e) {
       sprintf(painCave.errMsg, 
               "%s\n",
               e.getMessage().c_str());
@@ -262,10 +262,16 @@ namespace oopse {
       mdFile_.getline(buffer, bufferSize);
       ++lineNo;
       std::string line = trimLeftCopy(buffer);
-      i = CaseInsensitiveFind(line, "<OOPSE");
+      i = CaseInsensitiveFind(line, "<OpenMD");
       if (static_cast<size_t>(i) == string::npos) {
+        // try the older file strings to see if that works:
+        i = CaseInsensitiveFind(line, "<OOPSE");
+      }
+      
+      if (static_cast<size_t>(i) == string::npos) {
+        // still no luck!
         sprintf(painCave.errMsg, 
-                "SimCreator: File: %s is not an OOPSE file!\n", 
+                "SimCreator: File: %s is not a valid OpenMD file!\n", 
                 mdFileName.c_str()); 
         painCave.isFatal = 1; 
         simError(); 
@@ -471,7 +477,7 @@ namespace oopse {
               "\tthe number of molecules.  This will not result in a \n"
               "\tusable division of atoms for force decomposition.\n"
               "\tEither try a smaller number of processors, or run the\n"
-              "\tsingle-processor version of OOPSE.\n", nProcessors, nGlobalMols);
+              "\tsingle-processor version of OpenMD.\n", nProcessors, nGlobalMols);
       
       painCave.isFatal = 1;
       simError();
@@ -813,6 +819,6 @@ namespace oopse {
     info->getSnapshotManager()->advance();
   }
   
-} //end namespace oopse
+} //end namespace OpenMD