--- trunk/src/utils/GenericData.hpp	2005/04/15 22:04:00	507
+++ trunk/src/utils/GenericData.hpp	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).                        
  */
  
 /**
@@ -54,7 +54,8 @@
 #include <list>
 #include <string>
 #include <vector>
-namespace oopse{
+#include "config.h"
+namespace OpenMD{
 
   /**
    * @ class GenericData GenericData.hpp "utils/GenericData.hpp"
@@ -148,8 +149,8 @@ namespace oopse{
   /** FloatGenericData is a generic data type contains a float variable */
   typedef SimpleTypeData<float> FloatGenericData;
 
-  /** DoubleGenericData is a generic data type contains a double variable */
-  typedef SimpleTypeData<double> DoubleGenericData;
+  /** DoubleGenericData is a generic data type contains a RealType variable */
+  typedef SimpleTypeData<RealType> DoubleGenericData;
   
   /**
    * @typedef StringGenericData
@@ -160,7 +161,7 @@ namespace oopse{
    *   PropertyMap propMap;
    *   GenericData* gdata;
    *
-   *   s->setData("OOPSE");
+   *   s->setData("OpenMD");
    *   propMap->addProperty(s);
    *   
    *   gdata = propMap->getPropertyByName("MyStringGenericData");
@@ -189,7 +190,7 @@ namespace oopse{
     VectorTypeData(const std::string& id) 
       : GenericData(id){}
             
-    VectorTypeData(const SelfType& s) : SelfType(s){}
+    VectorTypeData(const SelfType& s) : data_(s){}
 
     SelfType& operator =(const SelfType& s){
       if (this == &s)
@@ -217,9 +218,9 @@ namespace oopse{
 
   /**
    * @typedef IntVectorGenericData
-   * A generic data type contains a  std::vector<double> variable.
+   * A generic data type contains a  std::vector<RealType> variable.
    */  
-  typedef VectorTypeData<double> DoubleVectorGenericData;
+  typedef VectorTypeData<RealType> DoubleVectorGenericData;
 
   /** 
    * @typedef StringVectorGenericData
@@ -232,7 +233,7 @@ namespace oopse{
    *  std::vector<std::string>::iterator iter;
    *  
    *  sv->push_back("Hello World");
-   *  sv->push_back("OOPSE");
+   *  sv->push_back("OpenMD");
    *
    *  propMap.addProperty(sv);
    *  
@@ -252,5 +253,5 @@ namespace oopse{
   typedef VectorTypeData<std::string> StringVectorGenericData;
   
 
-} // namespace oopse
+} // namespace OpenMD
 #endif //UTIL _GENERICDATA_HPP