--- trunk/src/utils/PropertyMap.cpp	2005/01/12 22:41:40	246
+++ branches/development/src/utils/PropertyMap.cpp	2010/07/09 23:08:25	1465
@@ -1,4 +1,4 @@
- /*
+/*
  * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
  *
  * The University of Notre Dame grants you ("Licensee") a
@@ -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,85 +28,94 @@
  * 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 "utils/PropertyMap.hpp"
 #include <cassert>
 #include <utility>
 
-namespace oopse {
+namespace OpenMD {
 
-PropertyMap::~PropertyMap(){
-  clearProperties();
-}
+  PropertyMap::~PropertyMap(){
+    clearProperties();
+  }
 
 
-void PropertyMap::addProperty(GenericData* genData){
+  void PropertyMap::addProperty(GenericData* genData){
     std::map<std::string, GenericData*>::iterator iter;
 
     iter = propMap_.find(genData->getID());
 
     if (iter == propMap_.end()){
-        propMap_.insert(std::make_pair(genData->getID(), genData));
+      propMap_.insert(std::make_pair(genData->getID(), genData));
     } else {
-        delete iter->second;
-        iter->second = genData;
+      delete iter->second;
+      iter->second = genData;
     }
-}
+  }
 
-bool PropertyMap::removeProperty(const std::string& propName){
-  std::map<std::string, GenericData*>::iterator iter;
+  bool PropertyMap::removeProperty(const std::string& propName){
+    std::map<std::string, GenericData*>::iterator iter;
 
     iter = propMap_.find(propName);
 
     if (iter != propMap_.end()){
-        delete iter->second;
-        propMap_.erase(iter);    
-        return true;
+      delete iter->second;
+      propMap_.erase(iter);    
+      return true;
     } else {
-        //logger.warn("Can not find property with name: " + propName);
-        return false;
+      //logger.warn("Can not find property with name: " + propName);
+      return false;
     }
-}
+  }
 
-void PropertyMap::clearProperties(){
+  void PropertyMap::clearProperties(){
     std::map<std::string, GenericData*>::iterator iter;
 
     for (iter = propMap_.begin(); iter != propMap_.end(); ++iter)
-        delete iter->second;
+      delete iter->second;
 
     propMap_.clear();
-}
+  }
 
-std::vector<std::string> PropertyMap::getPropertyNames(){
+  std::vector<std::string> PropertyMap::getPropertyNames(){
     std::vector<std::string> propNames;
     std::map<std::string, GenericData*>::iterator iter;
 
     for (iter = propMap_.begin(); iter != propMap_.end(); ++iter)
-        propNames.push_back(iter->first);
+      propNames.push_back(iter->first);
 
     return propNames;
-}
+  }
 
-std::vector<GenericData*> PropertyMap::getProperties(){
+  std::vector<GenericData*> PropertyMap::getProperties(){
     std::vector<GenericData*> properties;
     std::map<std::string, GenericData*>::iterator iter;
 
     for (iter = propMap_.begin(); iter != propMap_.end(); ++iter)
-        properties.push_back(iter->second);
+      properties.push_back(iter->second);
 
     return properties;
-}
+  }
 
-GenericData* PropertyMap::getPropertyByName(const std::string& propName){
+  GenericData* PropertyMap::getPropertyByName(const std::string& propName){
     std::map<std::string, GenericData*>::iterator iter;
 
     iter = propMap_.find(propName);
 
     if (iter != propMap_.end())
-        return iter->second;
+      return iter->second;
     else
-        return NULL;
-}
+      return NULL;
+  }
 
-}//end namepace oopse
+}//end namespace OpenMD