ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/primitives/Molecule.hpp
(Generate patch)

Comparing trunk/src/primitives/Molecule.hpp (file contents):
Revision 1211 by gezelter, Wed Jan 23 16:38:22 2008 UTC vs.
Revision 1360 by cli2, Mon Sep 7 16:31:51 2009 UTC

# Line 58 | Line 58
58   #include "primitives/Bond.hpp"
59   #include "primitives/Bend.hpp"
60   #include "primitives/Torsion.hpp"
61 + #include "primitives/Inversion.hpp"
62   #include "primitives/CutoffGroup.hpp"
63 + #include "utils/PropertyMap.hpp"
64  
65   namespace oopse{
66  
# Line 75 | Line 77 | namespace oopse{
77      typedef std::vector<Bond*>::iterator BondIterator;
78      typedef std::vector<Bend*>::iterator BendIterator;
79      typedef std::vector<Torsion*>::iterator TorsionIterator;
80 +    typedef std::vector<Inversion*>::iterator InversionIterator;
81      typedef std::vector<RigidBody*>::iterator RigidBodyIterator;
82      typedef std::vector<CutoffGroup*>::iterator CutoffGroupIterator;
83      typedef std::vector<StuntDouble*>::iterator IntegrableObjectIterator;
# Line 129 | Line 132 | namespace oopse{
132      
133      /** add a torsion into this molecule*/
134      void addTorsion(Torsion* torsion);
135 +
136 +    /** add an improper torsion into this molecule*/
137 +    void addInversion(Inversion* inversion);
138      
139      /** add a rigidbody into this molecule */
140      void addRigidBody(RigidBody *rb);
# Line 162 | Line 168 | namespace oopse{
168      unsigned int getNTorsions() {
169        return torsions_.size();
170      }
171 +
172 +    /** Returns the total number of improper torsions in this molecule */
173 +    unsigned int getNInversions() {
174 +      return inversions_.size();
175 +    }
176      
177      /** Returns the total number of rigid bodies in this molecule */        
178      unsigned int getNRigidBodies() {
# Line 232 | Line 243 | namespace oopse{
243      Torsion* nextTorsion(std::vector<Torsion*>::iterator& i) {
244        ++i;
245        return (i == torsions_.end()) ? NULL : *i;    
246 +    }    
247 +
248 +    Inversion* beginInversion(std::vector<Inversion*>::iterator& i) {
249 +      i = inversions_.begin();
250 +      return (i == inversions_.end()) ? NULL : *i;
251 +    }
252 +    
253 +    Inversion* nextInversion(std::vector<Inversion*>::iterator& i) {
254 +      ++i;
255 +      return (i == inversions_.end()) ? NULL : *i;    
256      }    
257      
258      RigidBody* beginRigidBody(std::vector<RigidBody*>::iterator& i) {
# Line 283 | Line 304 | namespace oopse{
304        ++i;
305        return (i == constraintElems_.end()) ? NULL : *i;    
306      }
307 <    
307 >        
308      /**
309       * Returns the total potential energy of short range interaction
310       * of this molecule
# Line 307 | Line 328 | namespace oopse{
328      }
329          
330      friend std::ostream& operator <<(std::ostream& o, Molecule& mol);
331 +
332 +    //below functions are just forward functions
333 +    /**
334 +     * Adds property into property map
335 +     * @param genData GenericData to be added into PropertyMap
336 +     */
337 +    void addProperty(GenericData* genData);
338 +
339 +    /**
340 +     * Removes property from PropertyMap by name
341 +     * @param propName the name of property to be removed
342 +     */
343 +    void removeProperty(const std::string& propName);
344 +
345 +    /**
346 +     * clear all of the properties
347 +     */
348 +    void clearProperties();
349 +
350 +    /**
351 +     * Returns all names of properties
352 +     * @return all names of properties
353 +     */
354 +    std::vector<std::string> getPropertyNames();
355 +
356 +    /**
357 +     * Returns all of the properties in PropertyMap
358 +     * @return all of the properties in PropertyMap
359 +     */      
360 +    std::vector<GenericData*> getProperties();
361 +
362 +    /**
363 +     * Returns property
364 +     * @param propName name of property
365 +     * @return a pointer point to property with propName. If no property named propName
366 +     * exists, return NULL
367 +     */      
368 +    GenericData* getPropertyByName(const std::string& propName);
369      
370    private:
371      
# Line 316 | Line 375 | namespace oopse{
375      std::vector<Bond*> bonds_;
376      std::vector<Bend*> bends_;
377      std::vector<Torsion*> torsions_;
378 +    std::vector<Inversion*> inversions_;
379      std::vector<RigidBody*> rigidBodies_;
380      std::vector<StuntDouble*> integrableObjects_;
381      std::vector<CutoffGroup*> cutoffGroups_;
# Line 323 | Line 383 | namespace oopse{
383      std::vector<ConstraintElem*> constraintElems_;
384      int stampId_;
385      std::string moleculeName_;
386 +    PropertyMap properties_;
387 +
388    };
389  
390   } //namespace oopse

Diff Legend

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