ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/constraints/ZconstraintForceManager.cpp
(Generate patch)

Comparing trunk/src/constraints/ZconstraintForceManager.cpp (file contents):
Revision 507 by gezelter, Fri Apr 15 22:04:00 2005 UTC vs.
Revision 770 by tim, Fri Dec 2 15:38:03 2005 UTC

# Line 59 | Line 59 | namespace oopse {
59        simError();    
60      }
61  
62 <    if (simParam->haveZconstraintTime()){
62 >    if (simParam->haveZconsTime()){
63        zconsTime_ = simParam->getZconsTime();
64      }
65      else{
# Line 85 | Line 85 | namespace oopse {
85      }
86  
87      //set zcons gap
88 <    if (simParam->haveZConsGap()){
88 >    if (simParam->haveZconsGap()){
89        usingZconsGap_ = true;
90        zconsGap_ = simParam->getZconsGap();
91      }else {
# Line 94 | Line 94 | namespace oopse {
94      }
95  
96      //set zcons fixtime
97 <    if (simParam->haveZConsFixTime()){
97 >    if (simParam->haveZconsFixtime()){
98        zconsFixingTime_ = simParam->getZconsFixtime();
99      } else {
100        zconsFixingTime_ = infiniteTime;
101      }
102  
103      //set zconsUsingSMD
104 <    if (simParam->haveZConsUsingSMD()){
104 >    if (simParam->haveZconsUsingSMD()){
105        usingSMD_ = simParam->getZconsUsingSMD();
106      }else {
107        usingSMD_ =false;
# Line 120 | Line 120 | namespace oopse {
120      }
121      double zforceConstant = OOPSEConstant::kb * targetTemp / (halfOfLargestBox * halfOfLargestBox);
122          
123 <    int nZconstraints = simParam->getNzConstraints();
124 <    ZconStamp** stamp = simParam->getZconStamp();
123 >    int nZconstraints = simParam->getNZconsStamps();
124 >    std::vector<ZConsStamp*> stamp = simParam->getZconsStamps();
125      //
126      for (int i = 0; i < nZconstraints; i++){
127  

Diff Legend

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