ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-3.0/src/types/AtomType.hpp
(Generate patch)

Comparing trunk/OOPSE-3.0/src/types/AtomType.hpp (file contents):
Revision 2094 by gezelter, Wed Mar 9 14:26:15 2005 UTC vs.
Revision 2204 by gezelter, Fri Apr 15 22:04:00 2005 UTC

# Line 52 | Line 52 | namespace oopse {
52   #include "UseTheForce/DarkSide/atype_interface.h"
53  
54   namespace oopse {
55 <    /**
56 <     * @class AtomType
57 <     * AtomType is what OOPSE looks to for unchanging data about an atom.
58 <     * Things that belong to AtomType are universal properties (i.e. does
59 <     * this atom have a Charge?  What is it's mass_?)  Dynamic properties of
60 <     * an atom are not intended to be properties of an atom type
61 <     */
62 <    class AtomType {
63 <        public:
55 >  /**
56 >   * @class AtomType
57 >   * AtomType is what OOPSE looks to for unchanging data about an atom.
58 >   * Things that belong to AtomType are universal properties (i.e. does
59 >   * this atom have a Charge?  What is it's mass_?)  Dynamic properties of
60 >   * an atom are not intended to be properties of an atom type
61 >   */
62 >  class AtomType {
63 >  public:
64  
65 <            AtomType();
65 >    AtomType();
66  
67 <            virtual ~AtomType() { } ;
67 >    virtual ~AtomType() { } ;
68  
69 <            virtual void complete();
69 >    virtual void complete();
70  
71 <            /**
72 <             * Finishes off the AtomType by communicating the logical portions of the
73 <             * structure to the Fortran atype module
74 <             */
75 <            void makeFortranAtomType();
71 >    /**
72 >     * Finishes off the AtomType by communicating the logical portions of the
73 >     * structure to the Fortran atype module
74 >     */
75 >    void makeFortranAtomType();
76              
77 <            void setMass(double m) {
78 <                mass_ = m;
79 <            }
77 >    void setMass(double m) {
78 >      mass_ = m;
79 >    }
80  
81 <            double getMass(void) {
82 <                return mass_;
83 <            }
81 >    double getMass(void) {
82 >      return mass_;
83 >    }
84  
85 <            void setIdent(int id) {
86 <                atp.ident = id;
87 <            }
85 >    void setIdent(int id) {
86 >      atp.ident = id;
87 >    }
88  
89 <            int getIdent() {
90 <                return atp.ident;
91 <            }
89 >    int getIdent() {
90 >      return atp.ident;
91 >    }
92  
93 <            void setName(const std::string&name) {
94 <                name_ = name;
95 <            }
93 >    void setName(const std::string&name) {
94 >      name_ = name;
95 >    }
96  
97 <            std::string getName() {
98 <                return name_;
99 <            }
97 >    std::string getName() {
98 >      return name_;
99 >    }
100  
101 <            void setLennardJones() {
102 <                atp.is_LennardJones = 1;
103 <            }
101 >    void setLennardJones() {
102 >      atp.is_LennardJones = 1;
103 >    }
104  
105 <            bool isLennardJones() {
106 <                return atp.is_LennardJones;
107 <            }
105 >    bool isLennardJones() {
106 >      return atp.is_LennardJones;
107 >    }
108  
109  
110 <            bool isElectrostatic() {
111 <                return isCharge() || isMultipole();
112 <            }
110 >    bool isElectrostatic() {
111 >      return isCharge() || isMultipole();
112 >    }
113  
114 <            void setEAM() {
115 <                atp.is_EAM = 1;
116 <            }
114 >    void setEAM() {
115 >      atp.is_EAM = 1;
116 >    }
117  
118 <            bool isEAM() {
119 <                return atp.is_EAM;
120 <            }
118 >    bool isEAM() {
119 >      return atp.is_EAM;
120 >    }
121  
122 <            void setCharge() {
123 <                atp.is_Charge = 1;
124 <            }
122 >    void setCharge() {
123 >      atp.is_Charge = 1;
124 >    }
125  
126 <            bool isCharge() {
127 <                return atp.is_Charge;
128 <            }
126 >    bool isCharge() {
127 >      return atp.is_Charge;
128 >    }
129  
130 <            bool isDirectional() {
131 <                return atp.is_Directional;
132 <            }
130 >    bool isDirectional() {
131 >      return atp.is_Directional;
132 >    }
133  
134 <            bool isDipole() {
135 <                return atp.is_Dipole;
136 <            }
134 >    bool isDipole() {
135 >      return atp.is_Dipole;
136 >    }
137  
138 <            bool isSplitDipole() {
139 <                return atp.is_SplitDipole;
140 <            }
138 >    bool isSplitDipole() {
139 >      return atp.is_SplitDipole;
140 >    }
141  
142 <            bool isQuadrupole() {
143 <                return atp.is_Quadrupole;
144 <            }
142 >    bool isQuadrupole() {
143 >      return atp.is_Quadrupole;
144 >    }
145              
146 <            bool isMultipole() {
147 <                return isDipole() || isQuadrupole();
148 <            }
146 >    bool isMultipole() {
147 >      return isDipole() || isQuadrupole();
148 >    }
149  
150 <            bool isGayBerne() {
151 <                return atp.is_GayBerne;
152 <            }
150 >    bool isGayBerne() {
151 >      return atp.is_GayBerne;
152 >    }
153  
154 <            bool isSticky() {
155 <                return atp.is_Sticky;
156 <            }
154 >    bool isSticky() {
155 >      return atp.is_Sticky;
156 >    }
157  
158 <            bool isShape() {
159 <                return atp.is_Shape;
160 <            }
158 >    bool isShape() {
159 >      return atp.is_Shape;
160 >    }
161  
162 <            //below functions are just forward functions
163 <            /**
164 <             * Adds property into property map
165 <             * @param genData GenericData to be added into PropertyMap
166 <             */
167 <            void addProperty(GenericData* genData);
162 >    //below functions are just forward functions
163 >    /**
164 >     * Adds property into property map
165 >     * @param genData GenericData to be added into PropertyMap
166 >     */
167 >    void addProperty(GenericData* genData);
168  
169 <            /**
170 <             * Removes property from PropertyMap by name
171 <             * @param propName the name of property to be removed
172 <             */
173 <            void removeProperty(const std::string& propName);
169 >    /**
170 >     * Removes property from PropertyMap by name
171 >     * @param propName the name of property to be removed
172 >     */
173 >    void removeProperty(const std::string& propName);
174  
175 <            /**
176 <             * clear all of the properties
177 <             */
178 <            void clearProperties();
175 >    /**
176 >     * clear all of the properties
177 >     */
178 >    void clearProperties();
179  
180 <            /**
181 <             * Returns all names of properties
182 <             * @return all names of properties
183 <             */
184 <            std::vector<std::string> getPropertyNames();
180 >    /**
181 >     * Returns all names of properties
182 >     * @return all names of properties
183 >     */
184 >    std::vector<std::string> getPropertyNames();
185  
186 <            /**
187 <             * Returns all of the properties in PropertyMap
188 <             * @return all of the properties in PropertyMap
189 <             */      
190 <            std::vector<GenericData*> getProperties();
186 >    /**
187 >     * Returns all of the properties in PropertyMap
188 >     * @return all of the properties in PropertyMap
189 >     */      
190 >    std::vector<GenericData*> getProperties();
191  
192 <            /**
193 <             * Returns property
194 <             * @param propName name of property
195 <             * @return a pointer point to property with propName. If no property named propName
196 <             * exists, return NULL
197 <             */      
198 <        GenericData* getPropertyByName(const std::string& propName);
192 >    /**
193 >     * Returns property
194 >     * @param propName name of property
195 >     * @return a pointer point to property with propName. If no property named propName
196 >     * exists, return NULL
197 >     */      
198 >    GenericData* getPropertyByName(const std::string& propName);
199  
200 <        protected:
200 >  protected:
201  
202 <            AtomTypeProperties atp;
203 <            double mass_;
204 <            std::string name_;
202 >    AtomTypeProperties atp;
203 >    double mass_;
204 >    std::string name_;
205  
206 <        private:
207 <            //prevent copy construction and copy assignment, since property map contains
208 <            //pointers which can not be copied and managered safely, except make the generic data
209 <            //at PropertyMap as copy on write shared pointer
210 <            AtomType(const AtomType&);
211 <            AtomType& operator=(const AtomType& atomType);
206 >  private:
207 >    //prevent copy construction and copy assignment, since property map contains
208 >    //pointers which can not be copied and managered safely, except make the generic data
209 >    //at PropertyMap as copy on write shared pointer
210 >    AtomType(const AtomType&);
211 >    AtomType& operator=(const AtomType& atomType);
212  
213              
214 <            PropertyMap properties_;
214 >    PropertyMap properties_;
215              
216 <    };
216 >  };
217  
218 <    struct LJParam {
219 <        double epsilon;
220 <        double sigma;
221 <        int soft_pot;
222 <    };
223 <    typedef SimpleTypeData<LJParam> LJParamGenericData;
218 >  struct LJParam {
219 >    double epsilon;
220 >    double sigma;
221 >    int soft_pot;
222 >  };
223 >  typedef SimpleTypeData<LJParam> LJParamGenericData;
224  
225 <    struct EAMParam {
226 <        double latticeConstant;        
227 <        int nrho;
228 <        double drho;
229 <        int nr;
230 <        double dr;
231 <        double rcut;
232 <        std::vector<double> rvals;
233 <        std::vector<double> rhovals;
234 <        std::vector<double> Frhovals;    
235 <    };
225 >  struct EAMParam {
226 >    double latticeConstant;        
227 >    int nrho;
228 >    double drho;
229 >    int nr;
230 >    double dr;
231 >    double rcut;
232 >    std::vector<double> rvals;
233 >    std::vector<double> rhovals;
234 >    std::vector<double> Frhovals;    
235 >  };
236  
237 <    typedef SimpleTypeData<EAMParam> EAMParamGenericData;
237 >  typedef SimpleTypeData<EAMParam> EAMParamGenericData;
238   }
239  
240   #endif

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines