--- trunk/src/io/SectionParserManager.hpp	2005/01/12 22:41:40	246
+++ branches/development/src/io/SectionParserManager.hpp	2011/11/22 20:38:56	1665
@@ -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,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, 24107 (2008).          
+ * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
+ * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
  */
  
 #ifndef IO_SECTIONPARSERMANAGER_HPP
@@ -46,64 +47,64 @@
 
 #include "io/SectionParser.hpp"
 
-namespace oopse {
+namespace OpenMD {
 
-struct SectionParserContext {
+  struct SectionParserContext {
     int priority;
     SectionParser* sectionParser;
     int lineNo;
     std::streampos  offset;
     bool isActive;
-};
+  };
 
-class SameSectionParserFunctor {
-    public:
-        SameSectionParserFunctor(const std::string section) : section_(section) {}
+  class SameSectionParserFunctor {
+  public:
+    SameSectionParserFunctor(const std::string section) : section_(section) {}
 
-        bool operator()(SectionParserContext context) {
-            return context.sectionParser->getSectionName() == section_;
-        }
+    bool operator()(SectionParserContext context) {
+      return context.sectionParser->getSectionName() == section_;
+    }
         
-    private:
-        std::string section_;
-};
-/**
- * @class SectionParserManager SectionParserManager.hpp "io/SectionParserManager.hpp"
- * SectionParserManager maintains a priority list
- */
-class SectionParserManager {
+  private:
+    std::string section_;
+  };
+  /**
+   * @class SectionParserManager SectionParserManager.hpp "io/SectionParserManager.hpp"
+   * SectionParserManager maintains a priority list
+   */
+  class SectionParserManager {
 
-    public:
-        typedef std::list<SectionParserContext> SectionParserContextList;
-        typedef SectionParserContextList::iterator iterator;
-        typedef SectionParserContextList::const_iterator const_iterator;
+  public:
+    typedef std::list<SectionParserContext> SectionParserContextList;
+    typedef SectionParserContextList::iterator iterator;
+    typedef SectionParserContextList::const_iterator const_iterator;
 
-        SectionParserManager() : beginPriority_(0), priorityDifference_(100) {}
-        ~SectionParserManager();
+    SectionParserManager() : beginPriority_(0), priorityDifference_(100) {}
+    ~SectionParserManager();
 
-        void parse(std::istream& input, ForceField&  ff);
+    void parse(std::istream& input, ForceField&  ff);
         
-        void push_front(SectionParser* sp);
+    void push_front(SectionParser* sp);
 
-        void push_back(SectionParser* sp);
+    void push_back(SectionParser* sp);
         
-        void insert(SectionParser* sp, int priority);
+    void insert(SectionParser* sp, int priority);
         
-        const_iterator begin() const {
-            return sectionParsers_.begin();
-        }
+    const_iterator begin() const {
+      return sectionParsers_.begin();
+    }
 
-        const_iterator end() const{
-            return sectionParsers_.end();
-        }
+    const_iterator end() const{
+      return sectionParsers_.end();
+    }
         
-    private:
-        iterator findSectionParser(const std::string& sectionName);
-        const int beginPriority_;
-        int priorityDifference_;
+  private:
+    iterator findSectionParser(const std::string& sectionName);
+    const int beginPriority_;
+    int priorityDifference_;
         
-        SectionParserContextList sectionParsers_;
-};
+    SectionParserContextList sectionParsers_;
+  };
 
 }
 #endif //IO_SECTIONPARSERMANAGER_HPP