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

Comparing trunk/src/primitives/StuntDouble.cpp (file contents):
Revision 246 by gezelter, Wed Jan 12 22:41:40 2005 UTC vs.
Revision 1309 by gezelter, Tue Oct 21 18:23:31 2008 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 50 | Line 50 | namespace oopse {
50  
51   namespace oopse {
52  
53 < StuntDouble::StuntDouble(ObjectType objType, DataStoragePointer storage) :
53 >  StuntDouble::StuntDouble(ObjectType objType, DataStoragePointer storage) :
54      objType_(objType), storage_(storage), snapshotMan_(NULL),    
55 <    linear_(false), linearAxis_(-1), globalIndex_(-1), localIndex_(-1){
56 < }
55 >    linear_(false), linearAxis_(-1), globalIndex_(-1), localIndex_(-1),
56 >    globalIntegrableObjectIndex_(-1){
57 >    }
58  
59 < StuntDouble::~StuntDouble() {
59 >  StuntDouble::~StuntDouble() {
60  
61 < }
61 >  }
62  
63 < void StuntDouble::zeroForcesAndTorques() {
63 >  void StuntDouble::zeroForcesAndTorques() {    
64      setFrc(V3Zero);
65      setTrq(V3Zero);
66 < }
67 < void StuntDouble::addProperty(GenericData* genData) {
66 >    setParticlePot(0.0);
67 >  }
68 >  void StuntDouble::addProperty(GenericData* genData) {
69      properties_.addProperty(genData);  
70 < }
70 >  }
71  
72 < void StuntDouble::removeProperty(const std::string& propName) {
72 >  void StuntDouble::removeProperty(const std::string& propName) {
73      properties_.removeProperty(propName);  
74 < }
74 >  }
75  
76 < void StuntDouble::clearProperties() {
76 >  void StuntDouble::clearProperties() {
77      properties_.clearProperties();
78 < }
78 >  }
79  
80 < std::vector<std::string> StuntDouble::getPropertyNames() {
80 >  std::vector<std::string> StuntDouble::getPropertyNames() {
81      return properties_.getPropertyNames();  
82 < }
82 >  }
83        
84 < std::vector<GenericData*> StuntDouble::getProperties() {
84 >  std::vector<GenericData*> StuntDouble::getProperties() {
85      return properties_.getProperties();
86 < }
86 >  }
87  
88 < GenericData* StuntDouble::getPropertyByName(const std::string& propName) {
88 >  GenericData* StuntDouble::getPropertyByName(const std::string& propName) {
89      return properties_.getPropertyByName(propName);
90 < }
90 >  }
91  
92  
93   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines