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 132 by tim, Thu Oct 21 16:22:01 2004 UTC vs.
Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC

# Line 1 | Line 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
5 + * non-exclusive, royalty free, license to use, modify and
6 + * redistribute this software in source and binary code form, provided
7 + * that the following conditions are met:
8 + *
9 + * 1. Redistributions of source code must retain the above copyright
10 + *    notice, this list of conditions and the following disclaimer.
11 + *
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.
16 + *
17 + * This software is provided "AS IS," without a warranty of any
18 + * kind. All express or implied conditions, representations and
19 + * warranties, including any implied warranty of merchantability,
20 + * fitness for a particular purpose or non-infringement, are hereby
21 + * excluded.  The University of Notre Dame and its licensors shall not
22 + * be liable for any damages suffered by licensee as a result of
23 + * using, modifying or distributing the software or its
24 + * derivatives. In no event will the University of Notre Dame or its
25 + * licensors be liable for any lost revenue, profit or data, or for
26 + * direct, indirect, special, consequential, incidental or punitive
27 + * damages, however caused and regardless of the theory of liability,
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
43   #define VISITOR_ATOMDATA_HPP
44 + #include <string>
45 + #include <vector>
46 +
47   #include "utils/GenericData.hpp"
48 + #include "math/Vector3.hpp"
49  
50 < using namespace std;
50 > namespace OpenMD {
51  
52 < namespace oopse {
52 >  struct AtomInfo {
53 >    AtomInfo() : hasCharge(false), hasVector(false) {}
54  
55 < struct AtomInfo {
56 <  public:
57 <    string AtomType;
58 <    double pos[3];
59 <    double dipole[3];  
60 < };
55 >    std::string atomTypeName;
56 >    Vector3d pos;
57 >    Vector3d dipole;  
58 >    RealType charge;
59 >    bool hasCharge;
60 >    bool hasVector;
61 >  };
62  
63 < class AtomData : public GenericData{
63 >  class AtomData : public GenericData{
64    public:
18    AtomData(const string& id = "ATOMDATA") : GenericData(id) {}
19    ~AtomData() {
20        vector<AtomInfo*>::iterator i;
21        AtomInfo* atomInfo;
65  
66 <        for(atomInfo = beginAtomInfo(i); atomInfo; atomInfo  = nextAtomInfo(i))
24 <            delete atomInfo;
66 >    AtomData(const std::string& id = "ATOMDATA") : GenericData(id) {}
67  
68 <        data.clear();
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      }
77 +        
78      void addAtomInfo(AtomInfo* info) {data.push_back(info);}
79 +
80      void clearAllAtomInfo();
81 <    AtomInfo* beginAtomInfo(vector<AtomInfo*>::iterator& i){
81 >
82 >    AtomInfo* beginAtomInfo(std::vector<AtomInfo*>::iterator& i){
83        i = data.begin();
84        return i != data.end()? *i : NULL;
85      }
86 <    AtomInfo* nextAtomInfo(vector<AtomInfo*>::iterator& i){
86 >
87 >    AtomInfo* nextAtomInfo(std::vector<AtomInfo*>::iterator& i){
88        ++i;
89        return i != data.end()? *i: NULL;
90      }
91 <    vector<AtomInfo*> getData() {return data;}
91 >
92 >    std::vector<AtomInfo*> getData() {return data;}
93 >
94      int getSize() {return data.size();}
95 +
96    protected:
41    vector<AtomInfo*> data;
42 };
97  
98 +    std::vector<AtomInfo*> data;
99 +  };
100  
101 +
102   }
103   #endif //VISITOR_ATOMDATA_HPP

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines