ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-4/src/io/DumpReader.cpp
(Generate patch)

Comparing trunk/OOPSE-4/src/io/DumpReader.cpp (file contents):
Revision 2300 by tim, Thu Sep 15 19:17:04 2005 UTC vs.
Revision 3003 by gezelter, Fri Sep 8 16:13:21 2006 UTC

# Line 1 | Line 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
5 < * non-exclusive, royalty free, license to use, modify and
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
19 < *    notice, this list of conditions and the following disclaimer.
20 < *
21 < * 3. Redistributions in binary form must reproduce the above copyright
22 < *    notice, this list of conditions and the following disclaimer in the
23 < *    documentation and/or other materials provided with the
24 < *    distribution.
25 < *
26 < * This software is provided "AS IS," without a warranty of any
27 < * kind. All express or implied conditions, representations and
28 < * warranties, including any implied warranty of merchantability,
29 < * fitness for a particular purpose or non-infringement, are hereby
30 < * excluded.  The University of Notre Dame and its licensors shall not
31 < * be liable for any damages suffered by licensee as a result of
32 < * using, modifying or distributing the software or its
33 < * derivatives. In no event will the University of Notre Dame or its
34 < * licensors be liable for any lost revenue, profit or data, or for
35 < * direct, indirect, special, consequential, incidental or punitive
36 < * damages, however caused and regardless of the theory of liability,
37 < * arising out of the use of or inability to use software, even if the
38 < * University of Notre Dame has been advised of the possibility of
39 < * such damages.
40 < */
41 <
42 < #define _LARGEFILE_SOURCE64
43 < #define _FILE_OFFSET_BITS 64
44 <
45 < #include <sys/types.h>
46 < #include <sys/stat.h>
47 <
48 < #include <iostream>
49 < #include <math.h>
50 <
51 < #include <stdio.h>
52 < #include <stdlib.h>
53 < #include <string.h>
54 <
55 < #include "io/DumpReader.hpp"
56 < #include "primitives/Molecule.hpp"
57 < #include "utils/simError.h"
58 < #include "utils/MemoryUtils.hpp"
59 < #include "utils/StringTokenizer.hpp"
60 <
61 < #ifdef IS_MPI
62 <
63 < #include <mpi.h>
64 < #define TAKE_THIS_TAG_CHAR 0
65 < #define TAKE_THIS_TAG_INT 1
66 <
67 < #endif // is_mpi
68 <
69 <
70 < namespace oopse {
1 > /*
2 > * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
3 > *
4 > * The University of Notre Dame grants you ("Licensee") a
5 > * non-exclusive, royalty free, license to use, modify and
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
19 > *    notice, this list of conditions and the following disclaimer.
20 > *
21 > * 3. Redistributions in binary form must reproduce the above copyright
22 > *    notice, this list of conditions and the following disclaimer in the
23 > *    documentation and/or other materials provided with the
24 > *    distribution.
25 > *
26 > * This software is provided "AS IS," without a warranty of any
27 > * kind. All express or implied conditions, representations and
28 > * warranties, including any implied warranty of merchantability,
29 > * fitness for a particular purpose or non-infringement, are hereby
30 > * excluded.  The University of Notre Dame and its licensors shall not
31 > * be liable for any damages suffered by licensee as a result of
32 > * using, modifying or distributing the software or its
33 > * derivatives. In no event will the University of Notre Dame or its
34 > * licensors be liable for any lost revenue, profit or data, or for
35 > * direct, indirect, special, consequential, incidental or punitive
36 > * damages, however caused and regardless of the theory of liability,
37 > * arising out of the use of or inability to use software, even if the
38 > * University of Notre Dame has been advised of the possibility of
39 > * such damages.
40 > */
41    
42 <  DumpReader::DumpReader(SimInfo* info, const std::string& filename)
43 <    : info_(info), filename_(filename), isScanned_(false), nframes_(0) {
42 > #define _LARGEFILE_SOURCE64
43 > #define _FILE_OFFSET_BITS 64
44 >
45 > #include <sys/types.h>
46 > #include <sys/stat.h>
47 >
48 > #include <iostream>
49 > #include <math.h>
50 >
51 > #include <stdio.h>
52 > #include <stdlib.h>
53 > #include <string.h>
54 >
55 > #include "io/DumpReader.hpp"
56 > #include "primitives/Molecule.hpp"
57 > #include "utils/simError.h"
58 > #include "utils/MemoryUtils.hpp"
59 > #include "utils/StringTokenizer.hpp"
60 >
61 > #ifdef IS_MPI
62 >
63 > #include <mpi.h>
64 > #define TAKE_THIS_TAG_CHAR 0
65 > #define TAKE_THIS_TAG_INT 1
66 >
67 > #endif // is_mpi
68 >
69 >
70 > namespace oopse {
71 >  
72 >  DumpReader::DumpReader(SimInfo* info, const std::string& filename)
73 >    : info_(info), filename_(filename), isScanned_(false), nframes_(0) {
74      
75 < #ifdef IS_MPI
75 > #ifdef IS_MPI
76      
77 <      if (worldRank == 0) {
78 < #endif
77 >    if (worldRank == 0) {
78 > #endif
79        
80 <        inFile_ = fopen(filename_.c_str(), "r");
80 >      inFile_ = new std::ifstream(filename_.c_str());
81        
82 <        if (inFile_ == NULL) {
83 <          sprintf(painCave.errMsg, "DumpReader: Cannot open file: %s\n", filename_.c_str());
84 <          painCave.isFatal = 1;
85 <          simError();
86 <        }
82 >      if (inFile_->fail()) {
83 >        sprintf(painCave.errMsg,
84 >                "DumpReader: Cannot open file: %s\n",
85 >                filename_.c_str());
86 >        painCave.isFatal = 1;
87 >        simError();
88 >      }
89        
90 < #ifdef IS_MPI
90 > #ifdef IS_MPI
91        
92 <      }
92 >    }
93      
94 <      strcpy(checkPointMsg, "Dump file opened for reading successfully.");
95 <      MPIcheckPoint();
94 >    strcpy(checkPointMsg, "Dump file opened for reading successfully.");
95 >    MPIcheckPoint();
96      
97 < #endif
97 > #endif
98      
99 <      return;
100 <    }
99 >    return;
100 >  }
101    
102 <  DumpReader::~DumpReader() {
102 >  DumpReader::~DumpReader() {
103      
104 < #ifdef IS_MPI
104 > #ifdef IS_MPI
105      
106 <    if (worldRank == 0) {
107 < #endif
106 >    if (worldRank == 0) {
107 > #endif
108        
109 <      int error;
108 <      error = fclose(inFile_);
109 >      delete inFile_;
110        
111 <      if (error) {
111 <        sprintf(painCave.errMsg, "DumpReader Error: Error closing %s\n", filename_.c_str());
112 <        painCave.isFatal = 1;            
113 <        simError();
114 <      }
111 > #ifdef IS_MPI
112        
113 <      MemoryUtils::deletePointers(framePos_);
117 <      
118 < #ifdef IS_MPI
119 <      
120 <    }
113 >    }
114      
115 <    strcpy(checkPointMsg, "Dump file closed successfully.");
116 <    MPIcheckPoint();
115 >    strcpy(checkPointMsg, "Dump file closed successfully.");
116 >    MPIcheckPoint();
117      
118 < #endif
118 > #endif
119      
120 <    return;
121 <  }
120 >    return;
121 >  }
122    
123 <  int DumpReader::getNFrames(void) {
123 >  int DumpReader::getNFrames(void) {
124 >    
125 >    if (!isScanned_)
126 >      scanFile();
127 >    
128 >    return nframes_;
129 >  }
130 >  
131 >  void DumpReader::scanFile(void) {
132 >    int lineNo = 0;
133 >    std::streampos prevPos;
134 >    std::streampos  currPos;
135      
136 <    if (!isScanned_)
133 <      scanFile();
136 > #ifdef IS_MPI
137      
138 <    return nframes_;
139 <  }
137 <  
138 <  void DumpReader::scanFile(void) {
139 <    int i, j;
140 <    int lineNum = 0;
141 <    char readBuffer[maxBufferSize];
142 <    fpos_t * currPos;
143 <    
144 < #ifdef IS_MPI
145 <    
146 <    if (worldRank == 0) {
147 < #endif // is_mpi
138 >    if (worldRank == 0) {
139 > #endif // is_mpi
140        
141 <      rewind(inFile_);
142 <      
143 <      currPos = new fpos_t;
144 <      fgetpos(inFile_, currPos);
145 <      fgets(readBuffer, sizeof(readBuffer), inFile_);
146 <      lineNum++;
155 <      
156 <      if (feof(inFile_)) {
157 <        sprintf(painCave.errMsg,
158 <                "DumpReader Error: File \"%s\" ended unexpectedly at line %d\n",
159 <                filename_.c_str(),
160 <                lineNum);
161 <        painCave.isFatal = 1;
162 <        simError();
163 <      }
164 <      
165 <      while (!feof(inFile_)) {
166 <        framePos_.push_back(currPos);
141 >      currPos = inFile_->tellg();
142 >      prevPos = currPos;
143 >      bool foundOpenSnapshotTag = false;
144 >      bool foundClosedSnapshotTag = false;
145 >      while(inFile_->getline(buffer, bufferSize)) {
146 >        ++lineNo;
147          
148 <        i = atoi(readBuffer);
149 <        
150 <        fgets(readBuffer, sizeof(readBuffer), inFile_);
151 <        lineNum++;
152 <        
153 <        if (feof(inFile_)) {
154 <          sprintf(painCave.errMsg,
155 <                  "DumpReader Error: File \"%s\" ended unexpectedly at line %d\n",
156 <                  filename_.c_str(),
157 <                  lineNum);
158 <          painCave.isFatal = 1;
159 <          simError();
160 <        }
181 <        
182 <        for(j = 0; j < i; j++) {
183 <          fgets(readBuffer, sizeof(readBuffer), inFile_);
184 <          lineNum++;
148 >        std::string line = buffer;
149 >        currPos = inFile_->tellg();
150 >        if (line.find("<Snapshot>")!= std::string::npos) {
151 >          if (foundOpenSnapshotTag) {
152 >            sprintf(painCave.errMsg,
153 >                    "DumpReader:<Snapshot> is multiply nested at line %d in %s \n", lineNo,
154 >                    filename_.c_str());
155 >            painCave.isFatal = 1;
156 >            simError();          
157 >          }
158 >          foundOpenSnapshotTag = true;
159 >          foundClosedSnapshotTag = false;
160 >          framePos_.push_back(prevPos);
161            
162 <          if (feof(inFile_)) {
163 <            sprintf(painCave.errMsg,
164 <                    "DumpReader Error: File \"%s\" ended unexpectedly at line %d,"
165 <                    " with atom %d\n", filename_.c_str(),
166 <                    lineNum,
167 <                    j);
168 <            
193 <            painCave.isFatal = 1;
194 <            simError();
162 >        } else if (line.find("</Snapshot>") != std::string::npos){
163 >          if (!foundOpenSnapshotTag) {
164 >            sprintf(painCave.errMsg,
165 >                    "DumpReader:</Snapshot> appears before <Snapshot> at line %d in %s \n", lineNo,
166 >                    filename_.c_str());
167 >            painCave.isFatal = 1;
168 >            simError();
169            }
170 +          
171 +          if (foundClosedSnapshotTag) {
172 +            sprintf(painCave.errMsg,
173 +                    "DumpReader:</Snapshot> appears multiply nested at line %d in %s \n", lineNo,
174 +                    filename_.c_str());
175 +            painCave.isFatal = 1;
176 +            simError();
177 +          }
178 +          foundClosedSnapshotTag = true;
179 +          foundOpenSnapshotTag = false;
180          }
181 <        
198 <        currPos = new fpos_t;
199 <        fgetpos(inFile_, currPos);
200 <        fgets(readBuffer, sizeof(readBuffer), inFile_);
201 <        lineNum++;
181 >        prevPos = currPos;
182        }
183        
184 <      delete currPos;
185 <      rewind(inFile_);
184 >      // only found <Snapshot> for the last frame means the file is corrupted, we should discard
185 >      // it and give a warning message
186 >      if (foundOpenSnapshotTag) {
187 >        sprintf(painCave.errMsg,
188 >                "DumpReader: last frame in %s is invalid\n", filename_.c_str());
189 >        painCave.isFatal = 0;
190 >        simError();      
191 >        framePos_.pop_back();
192 >      }
193        
194 <      nframes_ = framePos_.size();
208 < #ifdef IS_MPI
209 <    }
210 <    
211 <    MPI_Bcast(&nframes_, 1, MPI_INT, 0, MPI_COMM_WORLD);
212 <    
213 <    strcpy(checkPointMsg, "Successfully scanned DumpFile\n");
214 <    MPIcheckPoint();
215 <    
216 < #endif // is_mpi
217 <    
218 <    isScanned_ = true;
219 <  }
220 <  
221 <  void DumpReader::readFrame(int whichFrame) {
222 <    if (!isScanned_)
223 <      scanFile();
224 <        
225 <    int storageLayout = info_->getSnapshotManager()->getStorageLayout();
226 <    
227 <    if (storageLayout & DataStorage::dslPosition) {
228 <      needPos_ = true;
229 <    } else {
230 <      needPos_ = false;
231 <    }
232 <    
233 <    if (storageLayout & DataStorage::dslVelocity) {
234 <      needVel_ = true;
235 <    } else {
236 <      needVel_ = false;
237 <    }
238 <    
239 <    if (storageLayout & DataStorage::dslAmat || storageLayout & DataStorage::dslElectroFrame) {
240 <      needQuaternion_ = true;
241 <    } else {
242 <      needQuaternion_ = false;
243 <    }
244 <    
245 <    if (storageLayout & DataStorage::dslAngularMomentum) {
246 <      needAngMom_ = true;
247 <    } else {
248 <      needAngMom_ = false;    
249 <    }
250 <    
251 <    readSet(whichFrame);
252 <  }
253 <  
254 <  void DumpReader::readSet(int whichFrame) {
255 <    int i;
256 <    int nTotObjs;                  // the number of atoms
257 <    char read_buffer[maxBufferSize];  //the line buffer for reading
258 <    char * eof_test;               // ptr to see when we reach the end of the file
259 <    
260 <    Molecule* mol;
261 <    StuntDouble* integrableObject;
262 <    SimInfo::MoleculeIterator mi;
263 <    Molecule::IntegrableObjectIterator ii;
264 <    
265 < #ifndef IS_MPI
266 <    
267 <    fsetpos(inFile_, framePos_[whichFrame]);
268 <    eof_test = fgets(read_buffer, sizeof(read_buffer), inFile_);
269 <    
270 <    if (eof_test == NULL) {
271 <      sprintf(painCave.errMsg,
272 <              "DumpReader error: error reading 1st line of \"%s\"\n",
273 <              filename_.c_str());
274 <      painCave.isFatal = 1;
275 <      simError();
276 <    }
277 <    
278 <    nTotObjs = atoi(read_buffer);
279 <    
280 <    if (nTotObjs != info_->getNGlobalIntegrableObjects()) {
281 <      sprintf(painCave.errMsg,
282 <              "DumpReader error. %s nIntegrable, %d, "
283 <              "does not match the meta-data file's nIntegrable, %d.\n",
284 <              filename_.c_str(),
285 <              nTotObjs,
286 <              info_->getNGlobalIntegrableObjects());
194 >      nframes_ = framePos_.size();
195        
196 <      painCave.isFatal = 1;
197 <      simError();
198 <    }
199 <    
200 <    //read the box mat from the comment line
293 <    
294 <    eof_test = fgets(read_buffer, sizeof(read_buffer), inFile_);
295 <    
296 <    if (eof_test == NULL) {
297 <      sprintf(painCave.errMsg, "DumpReader Error: error in reading commment in %s\n",
298 <              filename_.c_str());
299 <      painCave.isFatal = 1;
300 <      simError();
301 <    }
302 <    
303 <    parseCommentLine(read_buffer, info_->getSnapshotManager()->getCurrentSnapshot());
304 <    
305 <    //parse dump lines
306 <    
307 <    i = 0;
308 <    for (mol = info_->beginMolecule(mi); mol != NULL; mol = info_->nextMolecule(mi)) {
309 <      
310 <      for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL;
311 <           integrableObject = mol->nextIntegrableObject(ii)) {          
312 <        
313 <        eof_test = fgets(read_buffer, sizeof(read_buffer), inFile_);
314 <        
315 <        if (eof_test == NULL) {
316 <          sprintf(painCave.errMsg,
317 <                  "DumpReader Error: error in reading file %s\n"
318 <                  "natoms  = %d; index = %d\n"
319 <                  "error reading the line from the file.\n",
320 <                  filename_.c_str(),
321 <                  nTotObjs,
322 <                  i);
323 <          
324 <          painCave.isFatal = 1;
325 <          simError();
326 <        }
327 <        
328 <        parseDumpLine(read_buffer, integrableObject);
329 <        i++;
196 >      if (nframes_ == 0) {
197 >        sprintf(painCave.errMsg,
198 >                "DumpReader: %s does not contain a valid frame\n", filename_.c_str());
199 >        painCave.isFatal = 1;
200 >        simError();      
201        }
202 <    }
202 > #ifdef IS_MPI
203 >    }
204 >    
205 >    MPI_Bcast(&nframes_, 1, MPI_INT, 0, MPI_COMM_WORLD);
206      
207 <    // MPI Section of code..........
207 > #endif // is_mpi
208      
209 < #else //IS_MPI
210 <    
211 <    // first thing first, suspend fatalities.
209 >    isScanned_ = true;
210 >  }
211 >  
212 >  void DumpReader::readFrame(int whichFrame) {
213 >    if (!isScanned_)
214 >      scanFile();
215 >        
216 >    int storageLayout = info_->getSnapshotManager()->getStorageLayout();
217 >    
218 >    if (storageLayout & DataStorage::dslPosition) {
219 >      needPos_ = true;
220 >    } else {
221 >      needPos_ = false;
222 >    }
223 >    
224 >    if (storageLayout & DataStorage::dslVelocity) {
225 >      needVel_ = true;
226 >    } else {
227 >      needVel_ = false;
228 >    }
229 >    
230 >    if (storageLayout & DataStorage::dslAmat || storageLayout & DataStorage::dslElectroFrame) {
231 >      needQuaternion_ = true;
232 >    } else {
233 >      needQuaternion_ = false;
234 >    }
235 >    
236 >    if (storageLayout & DataStorage::dslAngularMomentum) {
237 >      needAngMom_ = true;
238 >    } else {
239 >      needAngMom_ = false;    
240 >    }
241 >    
242 >    readSet(whichFrame);
243 >  }
244 >  
245 >  void DumpReader::readSet(int whichFrame) {    
246 >    std::string line;
247 >
248 > #ifndef IS_MPI
249 >
250 >    inFile_->clear();  
251 >    inFile_->seekg(framePos_[whichFrame]);
252 >
253 >    std::istream& inputStream = *inFile_;    
254 >
255 > #else
256      int masterNode = 0;
257 <    int nCurObj;
340 <    painCave.isEventLoop = 1;
341 <    
342 <    int myStatus; // 1 = wakeup & success; 0 = error; -1 = AllDone
343 <    int haveError;
344 <    
345 <    MPI_Status istatus;
346 <    int nitems;
347 <    
348 <    nTotObjs = info_->getNGlobalIntegrableObjects();
349 <    haveError = 0;
350 <    
257 >    std::stringstream sstream;
258      if (worldRank == masterNode) {
259 <      fsetpos(inFile_, framePos_[whichFrame]);
260 <      
261 <      eof_test = fgets(read_buffer, sizeof(read_buffer), inFile_);
262 <      
356 <      if (eof_test == NULL) {
357 <        sprintf(painCave.errMsg, "DumpReader Error: Error reading 1st line of %s \n ",
358 <                filename_.c_str());
359 <        painCave.isFatal = 1;
360 <        simError();
361 <      }
259 >      std::string sendBuffer;
260 >
261 >      inFile_->clear();  
262 >      inFile_->seekg(framePos_[whichFrame]);
263        
264 <      nitems = atoi(read_buffer);
265 <      
266 <      // Check to see that the number of integrable objects in the
267 <      // intial configuration file is the same as derived from the
268 <      // meta-data file.
269 <      
270 <      if (nTotObjs != nitems) {
271 <        sprintf(painCave.errMsg,
371 <                "DumpReader Error. %s nIntegrable, %d, "
372 <                "does not match the meta-data file's nIntegrable, %d.\n",
373 <                filename_.c_str(),
374 <                nTotObjs,
375 <                info_->getNGlobalIntegrableObjects());
376 <        
377 <        painCave.isFatal = 1;
378 <        simError();
264 >      while (inFile_->getline(buffer, bufferSize)) {
265 >
266 >        line = buffer;
267 >        sendBuffer += line;
268 >        sendBuffer += '\n';
269 >        if (line.find("</Snapshot>") != std::string::npos) {
270 >          break;
271 >        }        
272        }
273 +
274 +      int sendBufferSize = sendBuffer.size();
275 +      MPI_Bcast(&sendBufferSize, 1, MPI_INT, masterNode, MPI_COMM_WORLD);    
276 +      MPI_Bcast((void *)sendBuffer.c_str(), sendBufferSize, MPI_CHAR, masterNode, MPI_COMM_WORLD);    
277        
278 <      //read the boxMat from the comment line
279 <      
280 <      eof_test = fgets(read_buffer, sizeof(read_buffer), inFile_);
281 <      
282 <      if (eof_test == NULL) {
283 <        sprintf(painCave.errMsg, "DumpReader Error: error in reading commment in %s\n",
284 <                filename_.c_str());
285 <        painCave.isFatal = 1;
286 <        simError();
287 <      }
288 <      
289 <      //Every single processor will parse the comment line by itself
290 <      //By using this way, we might lose some efficiency, but if we want to add
291 <      //more parameters into comment line, we only need to modify function
292 <      //parseCommentLine
293 <      
294 <      MPI_Bcast(read_buffer, maxBufferSize, MPI_CHAR, masterNode, MPI_COMM_WORLD);
295 <      parseCommentLine(read_buffer, info_->getSnapshotManager()->getCurrentSnapshot());
296 <      
297 <      for(i = 0; i < info_->getNGlobalMolecules(); i++) {
298 <        int which_node = info_->getMolToProc(i);
278 >      sstream.str(sendBuffer);
279 >    } else {
280 >      int sendBufferSize;
281 >      MPI_Bcast(&sendBufferSize, 1, MPI_INT, masterNode, MPI_COMM_WORLD);    
282 >      char * recvBuffer = new char[sendBufferSize+1];
283 >      MPI_Bcast(recvBuffer, sendBufferSize, MPI_CHAR, masterNode, MPI_COMM_WORLD);    
284 >      sstream.str(recvBuffer);
285 >    }      
286 >
287 >    std::istream& inputStream = sstream;  
288 > #endif
289 >
290 >    inputStream.getline(buffer, bufferSize);
291 >
292 >    line = buffer;
293 >    if (line.find("<Snapshot>") == std::string::npos) {
294 >      sprintf(painCave.errMsg,
295 >              "DumpReader Error: can not find <Snapshot>\n");
296 >      painCave.isFatal = 1;
297 >      simError();
298 >    }
299 >    
300 >    //read frameData
301 >    readFrameProperties(inputStream);
302 >
303 >    //read StuntDoubles
304 >    readStuntDoubles(inputStream);    
305 >
306 >    inputStream.getline(buffer, bufferSize);
307 >    line = buffer;
308 >    if (line.find("</Snapshot>") == std::string::npos) {
309 >      sprintf(painCave.errMsg,
310 >              "DumpReader Error: can not find </Snapshot>\n");
311 >      painCave.isFatal = 1;
312 >      simError();
313 >    }        
314 >  
315 >  }
316 >  
317 >  void DumpReader::parseDumpLine(const std::string& line) {
318 >
319 >      
320 >    StringTokenizer tokenizer(line);
321 >    int nTokens;
322 >    
323 >    nTokens = tokenizer.countTokens();
324 >    
325 >    if (nTokens < 2) {
326 >      sprintf(painCave.errMsg,
327 >              "DumpReader Error: Not enough Tokens.\n%s\n", line.c_str());
328 >      painCave.isFatal = 1;
329 >      simError();
330 >    }
331 >
332 >    int index = tokenizer.nextTokenAsInt();
333 >
334 >    StuntDouble* integrableObject = info_->getIOIndexToIntegrableObject(index);
335 >
336 >    if (integrableObject == NULL) {
337 >      return;
338 >    }
339 >    std::string type = tokenizer.nextToken();
340 >    int size = type.size();
341 >
342 >    for(int i = 0; i < size; ++i) {
343 >      switch(type[i]) {
344          
345 <        if (which_node == masterNode) {
346 <          //molecules belong to master node
347 <          
348 <          mol = info_->getMoleculeByGlobalIndex(i);
349 <          
350 <          if (mol == NULL) {
351 <            sprintf(painCave.errMsg, "DumpReader Error: Molecule not found on node %d!", worldRank);
352 <            painCave.isFatal = 1;
353 <            simError();
354 <          }
355 <          
356 <          for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL;
357 <               integrableObject = mol->nextIntegrableObject(ii)){
358 <            
359 <            eof_test = fgets(read_buffer, sizeof(read_buffer), inFile_);
360 <            
361 <            if (eof_test == NULL) {
362 <              sprintf(painCave.errMsg,
363 <                      "DumpReader Error: error in reading file %s\n"
364 <                      "natoms  = %d; index = %d\n"
365 <                      "error reading the line from the file.\n",
366 <                      filename_.c_str(),
367 <                      nTotObjs,
368 <                      i);
345 >        case 'p': {
346 >            Vector3d pos;
347 >            pos[0] = tokenizer.nextTokenAsDouble();
348 >            pos[1] = tokenizer.nextTokenAsDouble();
349 >            pos[2] = tokenizer.nextTokenAsDouble();
350 >            if (needPos_) {
351 >              integrableObject->setPos(pos);
352 >            }            
353 >            break;
354 >        }
355 >        case 'v' : {
356 >            Vector3d vel;
357 >            vel[0] = tokenizer.nextTokenAsDouble();
358 >            vel[1] = tokenizer.nextTokenAsDouble();
359 >            vel[2] = tokenizer.nextTokenAsDouble();
360 >            if (needVel_) {
361 >              integrableObject->setVel(vel);
362 >            }
363 >            break;
364 >        }
365 >
366 >        case 'q' : {
367 >           Quat4d q;
368 >           if (integrableObject->isDirectional()) {
369                
370 <              painCave.isFatal = 1;
371 <              simError();
372 <            }
373 <            
432 <            parseDumpLine(read_buffer, integrableObject);
433 <          }
434 <        } else {
435 <          //molecule belongs to slave nodes
436 <          
437 <          MPI_Recv(&nCurObj, 1, MPI_INT, which_node, TAKE_THIS_TAG_INT,
438 <                   MPI_COMM_WORLD, &istatus);
439 <          
440 <          for(int j = 0; j < nCurObj; j++) {
441 <            eof_test = fgets(read_buffer, sizeof(read_buffer), inFile_);
442 <            
443 <            if (eof_test == NULL) {
444 <              sprintf(painCave.errMsg,
445 <                      "DumpReader Error: error in reading file %s\n"
446 <                      "natoms  = %d; index = %d\n"
447 <                      "error reading the line from the file.\n",
448 <                      filename_.c_str(),
449 <                      nTotObjs,
450 <                      i);
370 >             q[0] = tokenizer.nextTokenAsDouble();
371 >             q[1] = tokenizer.nextTokenAsDouble();
372 >             q[2] = tokenizer.nextTokenAsDouble();
373 >             q[3] = tokenizer.nextTokenAsDouble();
374                
375 <              painCave.isFatal = 1;
376 <              simError();
377 <            }
378 <            
379 <            MPI_Send(read_buffer, maxBufferSize, MPI_CHAR, which_node,
380 <                     TAKE_THIS_TAG_CHAR, MPI_COMM_WORLD);
375 >             RealType qlen = q.length();
376 >             if (qlen < oopse::epsilon) { //check quaternion is not equal to 0
377 >                
378 >               sprintf(painCave.errMsg,
379 >                       "DumpReader Error: initial quaternion error (q0^2 + q1^2 + q2^2 + q3^2) ~ 0\n");
380 >               painCave.isFatal = 1;
381 >               simError();
382 >                
383 >             }  
384 >              
385 >             q.normalize();
386 >             if (needQuaternion_) {            
387 >               integrableObject->setQ(q);
388 >             }              
389 >           }            
390 >           break;
391 >        }  
392 >        case 'j' : {
393 >          Vector3d ji;
394 >          if (integrableObject->isDirectional()) {
395 >             ji[0] = tokenizer.nextTokenAsDouble();
396 >             ji[1] = tokenizer.nextTokenAsDouble();
397 >             ji[2] = tokenizer.nextTokenAsDouble();
398 >             if (needAngMom_) {
399 >               integrableObject->setJ(ji);
400 >             }
401            }
402 +          break;
403 +        }  
404 +        case 'f': {
405 +
406 +          Vector3d force;
407 +          force[0] = tokenizer.nextTokenAsDouble();
408 +          force[1] = tokenizer.nextTokenAsDouble();
409 +          force[2] = tokenizer.nextTokenAsDouble();          
410 +          integrableObject->setFrc(force);
411 +          break;
412          }
413 +        case 't' : {
414 +
415 +           Vector3d torque;
416 +           torque[0] = tokenizer.nextTokenAsDouble();
417 +           torque[1] = tokenizer.nextTokenAsDouble();
418 +           torque[2] = tokenizer.nextTokenAsDouble();          
419 +           integrableObject->setTrq(torque);          
420 +           break;
421 +        }
422 +        default: {
423 +               sprintf(painCave.errMsg,
424 +                       "DumpReader Error: %s is an unrecognized type\n", type.c_str());
425 +               painCave.isFatal = 1;
426 +               simError();
427 +          break;  
428 +        }
429 +
430        }
431 <    } else {
432 <      //actions taken at slave nodes
433 <      MPI_Bcast(read_buffer, maxBufferSize, MPI_CHAR, masterNode, MPI_COMM_WORLD);
434 <      
435 <      /**@todo*/
436 <      parseCommentLine(read_buffer, info_->getSnapshotManager()->getCurrentSnapshot());
431 >    }
432 >    
433 >  }
434 >  
435 >
436 >  void  DumpReader::readStuntDoubles(std::istream& inputStream) {
437 >
438 >    inputStream.getline(buffer, bufferSize);
439 >    std::string line(buffer);
440 >    
441 >    if (line.find("<StuntDoubles>") == std::string::npos) {
442 >      sprintf(painCave.errMsg,
443 >              "DumpReader Error: Missing <StuntDoubles>\n");
444 >      painCave.isFatal = 1;
445 >      simError();
446 >    }
447 >
448 >    while(inputStream.getline(buffer, bufferSize)) {
449 >      line = buffer;
450        
451 <      for(i = 0; i < info_->getNGlobalMolecules(); i++) {
452 <        int which_node = info_->getMolToProc(i);
470 <        
471 <        if (which_node == worldRank) {
472 <          //molecule with global index i belongs to this processor
473 <          
474 <          mol = info_->getMoleculeByGlobalIndex(i);
475 <          if (mol == NULL) {
476 <            sprintf(painCave.errMsg, "DumpReader Error: Molecule not found on node %d!", worldRank);
477 <            painCave.isFatal = 1;
478 <            simError();
479 <          }
480 <          
481 <          nCurObj = mol->getNIntegrableObjects();
482 <          
483 <          MPI_Send(&nCurObj, 1, MPI_INT, masterNode, TAKE_THIS_TAG_INT,
484 <                   MPI_COMM_WORLD);
485 <          
486 <          for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL;
487 <               integrableObject = mol->nextIntegrableObject(ii)){
488 <            
489 <            MPI_Recv(read_buffer, maxBufferSize, MPI_CHAR, masterNode,
490 <                     TAKE_THIS_TAG_CHAR, MPI_COMM_WORLD, &istatus);
491 <            
492 <            parseDumpLine(read_buffer, integrableObject);
493 <          }
494 <          
495 <        }
496 <        
451 >      if(line.find("</StuntDoubles>") != std::string::npos) {
452 >        break;
453        }
454 <      
454 >
455 >      parseDumpLine(line);
456      }
500 –    
501 – #endif
502 –    
503 –  }
457    
458 <  void DumpReader::parseDumpLine(char *line, StuntDouble *integrableObject) {
459 <    
460 <    Vector3d pos;  // position place holders
461 <    Vector3d vel;  // velocity placeholders
462 <    Quat4d q;    // the quaternions
463 <    Vector3d ji;   // angular velocity placeholders;
464 <    StringTokenizer tokenizer(line);
465 <    int nTokens;
466 <    
467 <    nTokens = tokenizer.countTokens();
468 <    
469 <    if (nTokens < 14) {
470 <      sprintf(painCave.errMsg,
518 <              "DumpReader Error: Not enough Tokens.\n%s\n", line);
519 <      painCave.isFatal = 1;
520 <      simError();
458 >  }
459 >
460 >  void DumpReader::readFrameProperties(std::istream& inputStream) {
461 >
462 >    Snapshot* s = info_->getSnapshotManager()->getCurrentSnapshot();
463 >    inputStream.getline(buffer, bufferSize);
464 >    std::string line(buffer);
465 >
466 >    if (line.find("<FrameData>") == std::string::npos) {
467 >      sprintf(painCave.errMsg,
468 >              "DumpReader Error: Missing <FrameData>\n");
469 >      painCave.isFatal = 1;
470 >      simError();
471      }
472 <    
473 <    std::string name = tokenizer.nextToken();
474 <    
525 <    if (name != integrableObject->getType()) {
472 >
473 >    while(inputStream.getline(buffer, bufferSize)) {
474 >      line = buffer;
475        
476 <      sprintf(painCave.errMsg,
477 <              "DumpReader Error: Atom type [%s] in %s does not match Atom Type [%s] in .md file.\n",
529 <              name.c_str(), filename_.c_str(), integrableObject->getType().c_str());
530 <      painCave.isFatal = 1;
531 <      simError();        
532 <    }
533 <    
534 <    pos[0] = tokenizer.nextTokenAsDouble();
535 <    pos[1] = tokenizer.nextTokenAsDouble();
536 <    pos[2] = tokenizer.nextTokenAsDouble();
537 <    if (needPos_) {
538 <      integrableObject->setPos(pos);
539 <    }
540 <    
541 <    vel[0] = tokenizer.nextTokenAsDouble();
542 <    vel[1] = tokenizer.nextTokenAsDouble();
543 <    vel[2] = tokenizer.nextTokenAsDouble();
544 <    if (needVel_) {
545 <      integrableObject->setVel(vel);
546 <    }
547 <    
548 <    if (integrableObject->isDirectional()) {
549 <      
550 <      q[0] = tokenizer.nextTokenAsDouble();
551 <      q[1] = tokenizer.nextTokenAsDouble();
552 <      q[2] = tokenizer.nextTokenAsDouble();
553 <      q[3] = tokenizer.nextTokenAsDouble();
554 <      
555 <      double qlen = q.length();
556 <      if (qlen < oopse::epsilon) { //check quaternion is not equal to 0
557 <        
558 <        sprintf(painCave.errMsg,
559 <                "DumpReader Error: initial quaternion error (q0^2 + q1^2 + q2^2 + q3^2 ~ 0).\n");
560 <        painCave.isFatal = 1;
561 <        simError();
562 <        
563 <      }
564 <      
565 <      q.normalize();
566 <      if (needQuaternion_) {          
567 <        integrableObject->setQ(q);
476 >      if(line.find("</FrameData>") != std::string::npos) {
477 >        break;
478        }
479        
480 <      ji[0] = tokenizer.nextTokenAsDouble();
481 <      ji[1] = tokenizer.nextTokenAsDouble();
482 <      ji[2] = tokenizer.nextTokenAsDouble();
483 <      if (needAngMom_) {
484 <        integrableObject->setJ(ji);
480 >      StringTokenizer tokenizer(line, " ;\t\n\r{}:,");
481 >      if (!tokenizer.hasMoreTokens()) {
482 >        sprintf(painCave.errMsg,
483 >                "DumpReader Error: Not enough Tokens.\n%s\n", line.c_str());
484 >        painCave.isFatal = 1;
485 >        simError();      
486        }
487 <    }
488 <    
489 <  }
490 <  
491 <  
492 <  void DumpReader::parseCommentLine(char* line, Snapshot* s) {
493 <    double currTime;
494 <    Mat3x3d hmat;
495 <    double chi;
496 <    double integralOfChiDt;
497 <    Mat3x3d eta;
498 <    
499 <    StringTokenizer tokenizer(line);
500 <    int nTokens;
501 <    
502 <    nTokens = tokenizer.countTokens();
503 <    
504 <    //comment line should at least contain 10 tokens: current time(1 token) and  h-matrix(9 tokens)
505 <    if (nTokens < 10) {
506 <      sprintf(painCave.errMsg,
507 <              "DumpReader Error: Not enough tokens in comment line: %s", line);
508 <      painCave.isFatal = 1;
509 <      simError();  
510 <    }
511 <    
512 <    //read current time
513 <    currTime = tokenizer.nextTokenAsDouble();
514 <    s->setTime(currTime);
515 <    
516 <    //read h-matrix
517 <    hmat(0, 0) = tokenizer.nextTokenAsDouble();
518 <    hmat(0, 1) = tokenizer.nextTokenAsDouble();
519 <    hmat(0, 2) = tokenizer.nextTokenAsDouble();
520 <    hmat(1, 0) = tokenizer.nextTokenAsDouble();
521 <    hmat(1, 1) = tokenizer.nextTokenAsDouble();
522 <    hmat(1, 2) = tokenizer.nextTokenAsDouble();
523 <    hmat(2, 0) = tokenizer.nextTokenAsDouble();
524 <    hmat(2, 1) = tokenizer.nextTokenAsDouble();
525 <    hmat(2, 2) = tokenizer.nextTokenAsDouble();
526 <    s->setHmat(hmat);
616 <    
617 <    //read chi and integralOfChidt, they should apprear in pair
618 <    if (tokenizer.countTokens() >= 2) {
619 <      chi = tokenizer.nextTokenAsDouble();
620 <      integralOfChiDt = tokenizer.nextTokenAsDouble();            
487 >
488 >      std::string propertyName = tokenizer.nextToken();
489 >      if (propertyName == "Time") {
490 >        RealType currTime = tokenizer.nextTokenAsDouble();
491 >        s->setTime(currTime);
492 >      } else if (propertyName == "Hmat"){
493 >        Mat3x3d hmat;
494 >        hmat(0, 0) = tokenizer.nextTokenAsDouble();
495 >        hmat(0, 1) = tokenizer.nextTokenAsDouble();
496 >        hmat(0, 2) = tokenizer.nextTokenAsDouble();
497 >        hmat(1, 0) = tokenizer.nextTokenAsDouble();
498 >        hmat(1, 1) = tokenizer.nextTokenAsDouble();
499 >        hmat(1, 2) = tokenizer.nextTokenAsDouble();
500 >        hmat(2, 0) = tokenizer.nextTokenAsDouble();
501 >        hmat(2, 1) = tokenizer.nextTokenAsDouble();
502 >        hmat(2, 2) = tokenizer.nextTokenAsDouble();
503 >        s->setHmat(hmat);      
504 >      } else if (propertyName == "Thermostat") {
505 >        RealType chi = tokenizer.nextTokenAsDouble();
506 >        RealType integralOfChiDt = tokenizer.nextTokenAsDouble();
507 >        s->setChi(chi);
508 >        s->setIntegralOfChiDt(integralOfChiDt);        
509 >     } else if (propertyName == "Barostat") {
510 >        Mat3x3d eta;
511 >        eta(0, 0) = tokenizer.nextTokenAsDouble();
512 >        eta(0, 1) = tokenizer.nextTokenAsDouble();
513 >        eta(0, 2) = tokenizer.nextTokenAsDouble();
514 >        eta(1, 0) = tokenizer.nextTokenAsDouble();
515 >        eta(1, 1) = tokenizer.nextTokenAsDouble();
516 >        eta(1, 2) = tokenizer.nextTokenAsDouble();
517 >        eta(2, 0) = tokenizer.nextTokenAsDouble();
518 >        eta(2, 1) = tokenizer.nextTokenAsDouble();
519 >        eta(2, 2) = tokenizer.nextTokenAsDouble();
520 >        s->setEta(eta);
521 >      } else {
522 >        sprintf(painCave.errMsg,
523 >                "DumpReader Error: %s is an invalid property in <FrameData>\n", propertyName.c_str());
524 >        painCave.isFatal = 0;
525 >        simError();        
526 >      }
527        
622 –      s->setChi(chi);
623 –      s->setIntegralOfChiDt(integralOfChiDt);
528      }
529 <    
626 <    //read eta (eta is 3x3 matrix)
627 <    if (tokenizer.countTokens() >= 9) {
628 <      eta(0, 0) = tokenizer.nextTokenAsDouble();
629 <      eta(0, 1) = tokenizer.nextTokenAsDouble();
630 <      eta(0, 2) = tokenizer.nextTokenAsDouble();
631 <      eta(1, 0) = tokenizer.nextTokenAsDouble();
632 <      eta(1, 1) = tokenizer.nextTokenAsDouble();
633 <      eta(1, 2) = tokenizer.nextTokenAsDouble();
634 <      eta(2, 0) = tokenizer.nextTokenAsDouble();
635 <      eta(2, 1) = tokenizer.nextTokenAsDouble();
636 <      eta(2, 2) = tokenizer.nextTokenAsDouble();      
637 <      
638 <      s->setEta(eta);
639 <    }
640 <    
641 <    
529 >
530    }
531 <  
532 < }//end namespace oopse
531 >
532 >  
533 > }//end namespace oopse

Diff Legend

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