ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE/libmdtools/ZConstraint.cpp
(Generate patch)

Comparing trunk/OOPSE/libmdtools/ZConstraint.cpp (file contents):
Revision 1093 by tim, Wed Mar 17 14:22:59 2004 UTC vs.
Revision 1141 by tim, Wed Apr 28 23:09:32 2004 UTC

# Line 356 | Line 356 | template<typename T> ZConstraint<T>::ZConstraint(SimIn
356        cantPos.push_back(COM[whichDirection]);    
357    }
358  
359 +  if(usingSMD)
360 +    prevCantPos = cantPos;
361   #endif
362  
363    
# Line 470 | Line 472 | template<typename T> void ZConstraint<T>::update(){
472      if(usingSMD)
473        cantPos.push_back(COM[whichDirection]);        
474    }
475 +
476 +  if(usingSMD)
477 +  prevCantPos = cantPos;
478 +
479    //
480    forcePolicy->update();
481   }
# Line 974 | Line 980 | template<typename T> bool ZConstraint<T>::checkZConsSt
980      if (diff <= zconsTol && states[i] == zcsMoving){
981        states[i] = zcsFixed;
982        changed_local = 1;
983 +
984 +      if(usingSMD)
985 +        prevCantPos = cantPos;
986  
987        if (hasZConsGap)
988          endFixTime[i] = info->getTime() + zconsFixTime;
# Line 982 | Line 991 | template<typename T> bool ZConstraint<T>::checkZConsSt
991        states[i] = zcsMoving;
992        changed_local = 1;  
993  
994 +      if(usingSMD)
995 +         cantPos = prevCantPos;
996 +      
997        if (hasZConsGap)
998          endFixTime[i] = INFINITE_TIME;
999      }

Diff Legend

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