ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/visitors/AtomData.hpp
(Generate patch)

Comparing trunk/src/visitors/AtomData.hpp (file contents):
Revision 407 by gezelter, Tue Mar 8 21:07:49 2005 UTC vs.
Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC

# Line 1 | Line 1
1 < /*
1 > /*
2   * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
3   *
4   * The University of Notre Dame grants you ("Licensee") a
# Line 6 | Line 6
6   * redistribute this software in source and binary code form, provided
7   * that the following conditions are met:
8   *
9 < * 1. Acknowledgement of the program authors must be made in any
10 < *    publication of scientific results based in part on use of the
11 < *    program.  An acceptable form of acknowledgement is citation of
12 < *    the article in which the program was described (Matthew
13 < *    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
14 < *    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
15 < *    Parallel Simulation Engine for Molecular Dynamics,"
16 < *    J. Comput. Chem. 26, pp. 252-271 (2005))
17 < *
18 < * 2. Redistributions of source code must retain the above copyright
9 > * 1. Redistributions of source code must retain the above copyright
10   *    notice, this list of conditions and the following disclaimer.
11   *
12 < * 3. Redistributions in binary form must reproduce the above copyright
12 > * 2. Redistributions in binary form must reproduce the above copyright
13   *    notice, this list of conditions and the following disclaimer in the
14   *    documentation and/or other materials provided with the
15   *    distribution.
# Line 37 | Line 28
28   * arising out of the use of or inability to use software, even if the
29   * University of Notre Dame has been advised of the possibility of
30   * such damages.
31 + *
32 + * SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your
33 + * research, please cite the appropriate papers when you publish your
34 + * work.  Good starting points are:
35 + *                                                                      
36 + * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).            
37 + * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
38 + * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
39 + * [4]  Vardeman & Gezelter, in progress (2009).                        
40   */
41  
42   #ifndef VISITOR_ATOMDATA_HPP
# Line 47 | Line 47
47   #include "utils/GenericData.hpp"
48   #include "math/Vector3.hpp"
49  
50 < namespace oopse {
50 > namespace OpenMD {
51  
52 < struct AtomInfo {
52 >  struct AtomInfo {
53 >    AtomInfo() : hasCharge(false), hasVector(false) {}
54 >
55      std::string atomTypeName;
56      Vector3d pos;
57      Vector3d dipole;  
58 < };
58 >    RealType charge;
59 >    bool hasCharge;
60 >    bool hasVector;
61 >  };
62  
63 < class AtomData : public GenericData{
64 <    public:
63 >  class AtomData : public GenericData{
64 >  public:
65  
66 <        AtomData(const std::string& id = "ATOMDATA") : GenericData(id) {}
66 >    AtomData(const std::string& id = "ATOMDATA") : GenericData(id) {}
67  
68 <        ~AtomData() {
69 <            std::vector<AtomInfo*>::iterator i;
70 <            AtomInfo* atomInfo;
68 >    ~AtomData() {
69 >      std::vector<AtomInfo*>::iterator i;
70 >      AtomInfo* atomInfo;
71  
72 <            for(atomInfo = beginAtomInfo(i); atomInfo; atomInfo  = nextAtomInfo(i)) {
73 <                delete atomInfo;
74 <            }
75 <            data.clear();
76 <        }
72 >      for(atomInfo = beginAtomInfo(i); atomInfo; atomInfo  = nextAtomInfo(i)) {
73 >        delete atomInfo;
74 >      }
75 >      data.clear();
76 >    }
77          
78 <        void addAtomInfo(AtomInfo* info) {data.push_back(info);}
78 >    void addAtomInfo(AtomInfo* info) {data.push_back(info);}
79  
80 <        void clearAllAtomInfo();
80 >    void clearAllAtomInfo();
81  
82 <        AtomInfo* beginAtomInfo(std::vector<AtomInfo*>::iterator& i){
83 <            i = data.begin();
84 <            return i != data.end()? *i : NULL;
85 <        }
82 >    AtomInfo* beginAtomInfo(std::vector<AtomInfo*>::iterator& i){
83 >      i = data.begin();
84 >      return i != data.end()? *i : NULL;
85 >    }
86  
87 <        AtomInfo* nextAtomInfo(std::vector<AtomInfo*>::iterator& i){
88 <            ++i;
89 <            return i != data.end()? *i: NULL;
90 <        }
87 >    AtomInfo* nextAtomInfo(std::vector<AtomInfo*>::iterator& i){
88 >      ++i;
89 >      return i != data.end()? *i: NULL;
90 >    }
91  
92 <        std::vector<AtomInfo*> getData() {return data;}
92 >    std::vector<AtomInfo*> getData() {return data;}
93  
94 <        int getSize() {return data.size();}
94 >    int getSize() {return data.size();}
95  
96 <    protected:
96 >  protected:
97  
98 <        std::vector<AtomInfo*> data;
99 < };
98 >    std::vector<AtomInfo*> data;
99 >  };
100  
101  
102   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines