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

Comparing trunk/src/io/ZConsReader.cpp (file contents):
Revision 246 by gezelter, Wed Jan 12 22:41:40 2005 UTC vs.
Revision 770 by tim, Fri Dec 2 15:38:03 2005 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 44 | Line 44 | namespace oopse {
44   #include "utils/StringUtils.hpp"
45   namespace oopse {
46  
47 < ZConsReader::ZConsReader(SimInfo* info) : info_(info){
47 >  ZConsReader::ZConsReader(SimInfo* info) : info_(info){
48  
49      std::string zconsFileName_ = getPrefix(info_->getFinalConfigFileName()) + ".fz";
50      istream_.open(zconsFileName_.c_str());
51  
52      if (!istream_){
53 <        std::cerr << "open " << zconsFileName_ << "error" << std::endl;
54 <        exit(1);
53 >      std::cerr << "open " << zconsFileName_ << "error" << std::endl;
54 >      exit(1);
55      }
56  
57      Globals* simParam = info_->getSimParams();
58 <    int nZconstraints = simParam->getNzConstraints();
59 <    ZconStamp** stamp = simParam->getZconStamp();
58 >    int nZconstraints = simParam->getNZconsStamps();
59 >    std::vector<ZConsStamp*> stamp = simParam->getZconsStamps();
60      for (int i = 0; i < nZconstraints; i++){
61 <        allZmols_.push_back(stamp[i]->getMolIndex());
61 >      allZmols_.push_back(stamp[i]->getMolIndex());
62      }
63 < }
63 >  }
64  
65 < ZConsReader::~ZConsReader(){
66 <  istream_.close();
67 < }
65 >  ZConsReader::~ZConsReader(){
66 >    istream_.close();
67 >  }
68  
69 < void ZConsReader::readNextFrame(){
69 >  void ZConsReader::readNextFrame(){
70      char line[MAXBUFFERSIZE];  
71      int nFixedZmol;
72      int sscanfCount;
# Line 76 | Line 76 | void ZConsReader::readNextFrame(){
76      while(istream_.getline(line, MAXBUFFERSIZE) && line[0] == '/' && line[1] == '/');
77      sscanfCount = sscanf(line, "%lf", &curTime_);
78      if (sscanfCount != 1){
79 <        std::cerr << "ZConsReader Error : reading file error" << std::endl;
80 <        exit(1);
79 >      std::cerr << "ZConsReader Error : reading file error" << std::endl;
80 >      exit(1);
81      }
82  
83      istream_.getline(line, MAXBUFFERSIZE);
84      sscanfCount = sscanf(line, "%d", &nFixedZmol);
85      if (sscanfCount != 1){
86 <        std::cerr << "ZConsReader Error : reading file error" << std::endl;
87 <        exit(1);
86 >      std::cerr << "ZConsReader Error : reading file error" << std::endl;
87 >      exit(1);
88      }
89  
90      ZconsData data;
91      for(int i = 0; i < nFixedZmol; i++){
92 <        istream_.getline(line, MAXBUFFERSIZE);
93 <        sscanfCount = sscanf(line, "%d\t%lf\t%lf\t%lf", &data.zmolIndex, &data.zforce, &data.zpos,&data.zconsPos);
94 <        if (sscanfCount != 4){
95 <          std::cerr << "ZConsReader Error : reading file error" << std::endl;
96 <          exit(1);
97 <        }
92 >      istream_.getline(line, MAXBUFFERSIZE);
93 >      sscanfCount = sscanf(line, "%d\t%lf\t%lf\t%lf", &data.zmolIndex, &data.zforce, &data.zpos,&data.zconsPos);
94 >      if (sscanfCount != 4){
95 >        std::cerr << "ZConsReader Error : reading file error" << std::endl;
96 >        exit(1);
97 >      }
98  
99 <        fixedZmolData_.push_back(data);
99 >      fixedZmolData_.push_back(data);
100      }
101  
102 < }
102 >  }
103  
104 < bool ZConsReader::hasNextFrame(){
105 <  return istream_.peek() != EOF ? true : false;
106 < }
104 >  bool ZConsReader::hasNextFrame(){
105 >    return istream_.peek() != EOF ? true : false;
106 >  }
107  
108   }

Diff Legend

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