--- trunk/src/applications/staticProps/SCDOrderParameter.cpp	2006/10/18 21:58:48	1078
+++ trunk/src/applications/staticProps/SCDOrderParameter.cpp	2009/11/25 20:02:06	1390
@@ -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).                        
  */
 
 #include "applications/staticProps/SCDOrderParameter.hpp"
@@ -44,7 +44,7 @@
 #include "io/DumpReader.hpp"
 #include "primitives/Molecule.hpp"
 #include "utils/NumericConstant.hpp"
-namespace oopse {
+namespace OpenMD {
 
   SCDElem::SCDElem(SimInfo* info, const std::string& sele1, 
                    const std::string& sele2, const std::string& sele3) : sele1_(sele1), sele2_(sele2), sele3_(sele3){
@@ -67,7 +67,7 @@ namespace oopse {
     }else {
       sprintf( painCave.errMsg,
                "dynamic selection is not allowed\n");
-      painCave.severity = OOPSE_ERROR;
+      painCave.severity = OPENMD_ERROR;
       painCave.isFatal = 1;
       simError();  
     }
@@ -77,7 +77,7 @@ namespace oopse {
     }else {
       sprintf( painCave.errMsg,
                "dynamic selection is not allowed\n");
-      painCave.severity = OOPSE_ERROR;
+      painCave.severity = OPENMD_ERROR;
       painCave.isFatal = 1;
       simError();  
     }
@@ -87,7 +87,7 @@ namespace oopse {
     }else {
       sprintf( painCave.errMsg,
                "dynamic selection is not allowed\n");
-      painCave.severity = OOPSE_ERROR;
+      painCave.severity = OPENMD_ERROR;
       painCave.isFatal = 1;
       simError();  
     }
@@ -99,7 +99,7 @@ namespace oopse {
     if ( nselected1 != nselected2 || nselected1 != nselected3 ) {
       sprintf( painCave.errMsg,
                "The number of selected Stuntdoubles must be the same\n");
-      painCave.severity = OOPSE_ERROR;
+      painCave.severity = OPENMD_ERROR;
       painCave.isFatal = 1;
       simError();  
     }
@@ -169,9 +169,9 @@ namespace oopse {
     assert(beginIndex >=0 && endIndex >=0 && beginIndex <= endIndex - 2);
     for (int i = beginIndex; i <= endIndex -2 ; ++i) {
       std::string selectionTemplate = "select " + molname + ".";
-      std::string sele1 = selectionTemplate + OOPSE_itoa(i);
-      std::string sele2 = selectionTemplate + OOPSE_itoa(i+1); 
-      std::string sele3 = selectionTemplate + OOPSE_itoa(i+2);
+      std::string sele1 = selectionTemplate + OpenMD_itoa(i);
+      std::string sele2 = selectionTemplate + OpenMD_itoa(i+1); 
+      std::string sele3 = selectionTemplate + OpenMD_itoa(i+2);
         
       scdElems_.push_back(SCDElem(info, sele1, sele2, sele3));
     }