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.
branches/development/src/io/ZConsReader.cpp (file contents), Revision 1665 by gezelter, Tue Nov 22 20:38:56 2011 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 6 | Line 6
6   * redistribute this software in source and binary code form, provided
7   * that the following conditions are met:
8   *
9 < * 1. Acknowledgement of the program authors must be made in any
10 < *    publication of scientific results based in part on use of the
11 < *    program.  An acceptable form of acknowledgement is citation of
12 < *    the article in which the program was described (Matthew
13 < *    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
14 < *    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
15 < *    Parallel Simulation Engine for Molecular Dynamics,"
16 < *    J. Comput. Chem. 26, pp. 252-271 (2005))
17 < *
18 < * 2. Redistributions of source code must retain the above copyright
9 > * 1. Redistributions of source code must retain the above copyright
10   *    notice, this list of conditions and the following disclaimer.
11   *
12 < * 3. Redistributions in binary form must reproduce the above copyright
12 > * 2. Redistributions in binary form must reproduce the above copyright
13   *    notice, this list of conditions and the following disclaimer in the
14   *    documentation and/or other materials provided with the
15   *    distribution.
# Line 37 | Line 28
28   * arising out of the use of or inability to use software, even if the
29   * University of Notre Dame has been advised of the possibility of
30   * such damages.
31 + *
32 + * SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your
33 + * research, please cite the appropriate papers when you publish your
34 + * work.  Good starting points are:
35 + *                                                                      
36 + * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).            
37 + * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
38 + * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
39 + * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40 + * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
42  
43   #include "io/ZConsReader.hpp"
44   #include "utils/simError.h"
45   #include "utils/StringUtils.hpp"
46 < namespace oopse {
46 > namespace OpenMD {
47  
48 < ZConsReader::ZConsReader(SimInfo* info) : info_(info){
48 >  ZConsReader::ZConsReader(SimInfo* info) : info_(info){
49  
50      std::string zconsFileName_ = getPrefix(info_->getFinalConfigFileName()) + ".fz";
51      istream_.open(zconsFileName_.c_str());
52  
53      if (!istream_){
54 <        std::cerr << "open " << zconsFileName_ << "error" << std::endl;
55 <        exit(1);
54 >      std::cerr << "open " << zconsFileName_ << "error" << std::endl;
55 >      exit(1);
56      }
57  
58      Globals* simParam = info_->getSimParams();
59 <    int nZconstraints = simParam->getNzConstraints();
60 <    ZconStamp** stamp = simParam->getZconStamp();
59 >    int nZconstraints = simParam->getNZconsStamps();
60 >    std::vector<ZConsStamp*> stamp = simParam->getZconsStamps();
61      for (int i = 0; i < nZconstraints; i++){
62 <        allZmols_.push_back(stamp[i]->getMolIndex());
62 >      allZmols_.push_back(stamp[i]->getMolIndex());
63      }
64 < }
64 >  }
65  
66 < ZConsReader::~ZConsReader(){
67 <  istream_.close();
68 < }
66 >  ZConsReader::~ZConsReader(){
67 >    istream_.close();
68 >  }
69  
70 < void ZConsReader::readNextFrame(){
70 >  void ZConsReader::readNextFrame(){
71      char line[MAXBUFFERSIZE];  
72      int nFixedZmol;
73      int sscanfCount;
# Line 76 | Line 77 | void ZConsReader::readNextFrame(){
77      while(istream_.getline(line, MAXBUFFERSIZE) && line[0] == '/' && line[1] == '/');
78      sscanfCount = sscanf(line, "%lf", &curTime_);
79      if (sscanfCount != 1){
80 <        std::cerr << "ZConsReader Error : reading file error" << std::endl;
81 <        exit(1);
80 >      std::cerr << "ZConsReader Error : reading file error" << std::endl;
81 >      exit(1);
82      }
83  
84      istream_.getline(line, MAXBUFFERSIZE);
85      sscanfCount = sscanf(line, "%d", &nFixedZmol);
86      if (sscanfCount != 1){
87 <        std::cerr << "ZConsReader Error : reading file error" << std::endl;
88 <        exit(1);
87 >      std::cerr << "ZConsReader Error : reading file error" << std::endl;
88 >      exit(1);
89      }
90  
91      ZconsData data;
92      for(int i = 0; i < nFixedZmol; i++){
93 <        istream_.getline(line, MAXBUFFERSIZE);
94 <        sscanfCount = sscanf(line, "%d\t%lf\t%lf\t%lf", &data.zmolIndex, &data.zforce, &data.zpos,&data.zconsPos);
95 <        if (sscanfCount != 4){
96 <          std::cerr << "ZConsReader Error : reading file error" << std::endl;
97 <          exit(1);
98 <        }
93 >      istream_.getline(line, MAXBUFFERSIZE);
94 >      sscanfCount = sscanf(line, "%d\t%lf\t%lf\t%lf", &data.zmolIndex, &data.zforce, &data.zpos,&data.zconsPos);
95 >      if (sscanfCount != 4){
96 >        std::cerr << "ZConsReader Error : reading file error" << std::endl;
97 >        exit(1);
98 >      }
99  
100 <        fixedZmolData_.push_back(data);
100 >      fixedZmolData_.push_back(data);
101      }
102  
103 < }
103 >  }
104  
105 < bool ZConsReader::hasNextFrame(){
106 <  return istream_.peek() != EOF ? true : false;
107 < }
105 >  bool ZConsReader::hasNextFrame(){
106 >    return istream_.peek() != EOF ? true : false;
107 >  }
108  
109   }

Comparing:
trunk/src/io/ZConsReader.cpp (property svn:keywords), Revision 246 by gezelter, Wed Jan 12 22:41:40 2005 UTC vs.
branches/development/src/io/ZConsReader.cpp (property svn:keywords), Revision 1665 by gezelter, Tue Nov 22 20:38:56 2011 UTC

# Line 0 | Line 1
1 + Author Id Revision Date

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines