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

Comparing trunk/src/visitors/ZconsVisitor.cpp (file contents):
Revision 665 by tim, Thu Oct 13 22:26:47 2005 UTC vs.
Revision 963 by tim, Wed May 17 21:51:42 2006 UTC

# Line 43 | Line 43
43   #include "visitors/ZconsVisitor.hpp"
44   #include "primitives/Molecule.hpp"
45   #include "utils/StringUtils.hpp"
46 + #include "types/ZconsStamp.hpp"
47   namespace oopse {
48  
49    ZConsVisitor::ZConsVisitor(SimInfo* info) : BaseVisitor(), info_(info), zconsReader_(NULL){
# Line 76 | Line 77 | namespace oopse {
77        simError();      
78      }    
79          
80 <    int nZconstraints = simParam->getNZconstraints();
81 <    ZconStamp** stamp = simParam->getZconStamp();
80 >    int nZconstraints = simParam->getNZconsStamps();
81 >    std::vector<ZConsStamp*> stamp = simParam->getZconsStamps();
82      for (int i = 0; i < nZconstraints; i++){
83        int zmolIndex = stamp[i]->getMolIndex();
84        zmolStates_.insert(std::make_pair(zmolIndex, zsMoving));
# Line 156 | Line 157 | namespace oopse {
157      
158    }
159  
160 <  void ZConsVisitor::readZconsFile(double time) {
161 <    double tempTime;
160 >  void ZConsVisitor::readZconsFile(RealType time) {
161 >    RealType tempTime;
162      while(zconsReader_->hasNextFrame()){
163        tempTime = zconsReader_->getCurTime();
164        if(tempTime >= time) {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines