--- trunk/src/brains/SimInfo.cpp	2009/10/23 18:41:09	1386
+++ trunk/src/brains/SimInfo.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).                        
  */
  
 /**
@@ -74,7 +74,7 @@
 #include "UseTheForce/DarkSide/simParallel_interface.h"
 #endif 
 
-namespace oopse {
+namespace OpenMD {
   std::set<int> getRigidSet(int index, std::map<int, std::set<int> >& container) {
     std::map<int, std::set<int> >::iterator i = container.find(index);
     std::set<int> result;
@@ -969,7 +969,7 @@ namespace oopse {
       sprintf( painCave.errMsg,
 	       "There was an error setting the simulation information in fortran.\n" );
       painCave.isFatal = 1;
-      painCave.severity = OOPSE_ERROR;
+      painCave.severity = OPENMD_ERROR;
       simError();
     }
     
@@ -1105,7 +1105,7 @@ namespace oopse {
 	  rsw_ = 0.85 * rcut_;
 	  sprintf(painCave.errMsg,
 		  "SimCreator Warning: No value was set for the switchingRadius.\n"
-		  "\tOOPSE will use a default value of 85 percent of the cutoffRadius.\n"
+		  "\tOpenMD will use a default value of 85 percent of the cutoffRadius.\n"
 		  "\tswitchingRadius = %f. for this simulation\n", rsw_);
         painCave.isFatal = 0;
 	simError();
@@ -1113,7 +1113,7 @@ namespace oopse {
 	  rsw_ = rcut_;
 	  sprintf(painCave.errMsg,
 		  "SimCreator Warning: No value was set for the switchingRadius.\n"
-		  "\tOOPSE will use the same value as the cutoffRadius.\n"
+		  "\tOpenMD will use the same value as the cutoffRadius.\n"
 		  "\tswitchingRadius = %f. for this simulation\n", rsw_);
 	  painCave.isFatal = 0;
 	  simError();
@@ -1139,7 +1139,7 @@ namespace oopse {
       if (fInfo_.SIM_uses_Charges | fInfo_.SIM_uses_Dipoles | fInfo_.SIM_uses_RF) {
         sprintf(painCave.errMsg,
                 "SimCreator Warning: No value was set for the cutoffRadius.\n"
-                "\tOOPSE will use a default value of 15.0 angstroms"
+                "\tOpenMD will use a default value of 15.0 angstroms"
                 "\tfor the cutoffRadius.\n");
         painCave.isFatal = 0;
 	simError();
@@ -1173,7 +1173,7 @@ namespace oopse {
         } else {        
           sprintf(painCave.errMsg,
                   "SimCreator Warning: No value was set for switchingRadius.\n"
-                  "\tOOPSE will use a default value of\n"
+                  "\tOpenMD will use a default value of\n"
                   "\t0.85 * cutoffRadius for the switchingRadius\n");
           painCave.isFatal = 0;
           simError();
@@ -1634,5 +1634,5 @@ namespace oopse {
       return sdByGlobalIndex_.at(index);
     }   
 */   
-}//end namespace oopse
+}//end namespace OpenMD