--- trunk/src/utils/GenericData.hpp	2006/05/17 21:51:42	963
+++ trunk/src/utils/GenericData.hpp	2013/06/16 15:15:42	1879
@@ -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,16 @@
  * 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, 234107 (2008).          
+ * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
+ * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
  */
  
 /**
@@ -44,7 +45,6 @@
  * @brief
  * @author tlin
  * @date 09/20/2004
- * @time 9:30am
  * @version 1.0
  */
  
@@ -55,7 +55,7 @@
 #include <string>
 #include <vector>
 #include "config.h"
-namespace oopse{
+namespace OpenMD{
 
   /**
    * @ class GenericData GenericData.hpp "utils/GenericData.hpp"
@@ -132,7 +132,7 @@ namespace oopse{
     ElemDataType& getData()  {return data_;}
     /**
      * Sets POD data
-     * @data POD data to be set
+     * @param data POD data to be set
      */
     void setData(const ElemDataType& data) { data_ = data;  }
 
@@ -161,7 +161,7 @@ namespace oopse{
    *   PropertyMap propMap;
    *   GenericData* gdata;
    *
-   *   s->setData("OOPSE");
+   *   s->setData("OpenMD");
    *   propMap->addProperty(s);
    *   
    *   gdata = propMap->getPropertyByName("MyStringGenericData");
@@ -179,8 +179,8 @@ namespace oopse{
    * @class STLContainerTypeData 
    * @brief STL container type generic data which is associated with an id
    *
-   * @template ContainerType
-   * @template ElemDataType
+   * \tparam ContainerType
+   * \tparam ElemDataType
    */
   template <typename ElemDataType > 
   class VectorTypeData : public GenericData {
@@ -233,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);
    *  
@@ -253,5 +253,5 @@ namespace oopse{
   typedef VectorTypeData<std::string> StringVectorGenericData;
   
 
-} // namespace oopse
+} // namespace OpenMD
 #endif //UTIL _GENERICDATA_HPP