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

Comparing trunk/src/io/RestReader.cpp (file contents):
Revision 1407 by cli2, Wed Jan 20 16:04:40 2010 UTC vs.
Revision 1938 by gezelter, Thu Oct 31 15:32:17 2013 UTC

# Line 35 | Line 35
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]  Vardeman & Gezelter, in progress (2009).                        
38 > * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (2008).          
39 > * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40 > * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
41
42  
43 + #ifdef IS_MPI
44 + #include <mpi.h>
45 + #endif
46 +
47   #include <sys/types.h>
48   #include <sys/stat.h>
49  
# Line 58 | Line 62
62   #include "utils/StringTokenizer.hpp"
63   #include "restraints/ObjectRestraint.hpp"
64   #include "restraints/MolecularRestraint.hpp"
61
62 #ifdef IS_MPI
63
64 #include <mpi.h>
65 #endif
65  
66   namespace OpenMD {
67  
68    void RestReader::scanFile(){
69 <    int lineNo = 0;
69 >
70      std::streampos prevPos;
71      std::streampos  currPos;
72      
# Line 81 | Line 80 | namespace OpenMD {
80        prevPos = currPos;
81        
82        bool foundOpenSnapshotTag = false;
83 <      
83 >      int lineNo = 0;      
84        while(!foundOpenSnapshotTag && inFile_->getline(buffer, bufferSize)) {
85          ++lineNo;
86          
# Line 96 | Line 95 | namespace OpenMD {
95        
96   #ifdef IS_MPI
97      }
98 <    MPI_Bcast(&framePos_, 1, MPI_INT, 0, MPI_COMM_WORLD);
98 >    MPI::COMM_WORLD.Bcast(&framePos_, 1, MPI::INT, 0);
99   #endif // is_mpi
100    }
101  
# Line 131 | Line 130 | namespace OpenMD {
130        }
131        
132        int sendBufferSize = sendBuffer.size();
133 <      MPI_Bcast(&sendBufferSize, 1, MPI_INT, masterNode, MPI_COMM_WORLD);    
134 <      MPI_Bcast((void *)sendBuffer.c_str(), sendBufferSize, MPI_CHAR, masterNode, MPI_COMM_WORLD);    
133 >      MPI::COMM_WORLD.Bcast(&sendBufferSize, 1, MPI::INT, masterNode);
134 >      MPI::COMM_WORLD.Bcast((void *)sendBuffer.c_str(), sendBufferSize,
135 >                            MPI::CHAR, masterNode);
136        
137        sstream.str(sendBuffer);
138      } else {
139        int sendBufferSize;
140 <      MPI_Bcast(&sendBufferSize, 1, MPI_INT, masterNode, MPI_COMM_WORLD);    
140 >      MPI::COMM_WORLD.Bcast(&sendBufferSize, 1, MPI::INT, masterNode);
141        char * recvBuffer = new char[sendBufferSize+1];
142        assert(recvBuffer);
143        recvBuffer[sendBufferSize] = '\0';
144 <      MPI_Bcast(recvBuffer, sendBufferSize, MPI_CHAR, masterNode, MPI_COMM_WORLD);    
144 >      MPI::COMM_WORLD.Bcast(recvBuffer, sendBufferSize, MPI::CHAR, masterNode);
145        sstream.str(recvBuffer);
146        delete [] recvBuffer;
147      }      
# Line 191 | Line 191 | namespace OpenMD {
191  
192      scanFile();
193  
194
194      readSet();
195  
196  
# Line 280 | Line 279 | namespace OpenMD {
279  
280      int index = tokenizer.nextTokenAsInt();
281  
282 +    StuntDouble* sd = info_->getIOIndexToIntegrableObject(index);
283 +
284 +    if (sd == NULL) {
285 +      return;
286 +    }
287    
288 <    if (index < 1116){
289 <      std::string type = tokenizer.nextToken();
290 <      
291 <      Vector3d pos;
292 <      
293 <      pos[0] = tokenizer.nextTokenAsDouble();
294 <      pos[1] = tokenizer.nextTokenAsDouble();
295 <      pos[2] = tokenizer.nextTokenAsDouble();
296 <      
297 <      all_pos_[index] = pos;
294 <    }else{
295 <      
296 <      bool exist = false;
297 <      int indexCount = 0;
298 <      
299 <      while ( (!exist) && (indexCount < stuntDoubleIndex_.size())){
300 <        if (index == stuntDoubleIndex_[indexCount])
301 <          exist = true;
302 <        indexCount++;
303 <      }
304 <      
305 <      StuntDouble* integrableObject;
306 <      
307 <      if (exist){
308 <        
309 <        integrableObject = info_->getIOIndexToIntegrableObject(index);
310 <        
311 <        int compareindex = integrableObject->getGlobalIntegrableObjectIndex();
312 <        
313 <        if (integrableObject == NULL) {
314 <          return;
315 <        }  
316 <        
317 <        std::string type = tokenizer.nextToken();
318 <        
319 <        Vector3d pos;
320 <        
288 >    std::string type = tokenizer.nextToken();
289 >    int size = type.size();
290 >    
291 >    Vector3d pos;
292 >    Quat4d q;
293 >
294 >    for(int i = 0; i < size; ++i) {
295 >      switch(type[i]) {
296 >
297 >      case 'p': {
298          pos[0] = tokenizer.nextTokenAsDouble();
299          pos[1] = tokenizer.nextTokenAsDouble();
300          pos[2] = tokenizer.nextTokenAsDouble();
301 <        
301 >        break;
302 >      }
303 >      case 'v' : {
304          Vector3d vel;
305          vel[0] = tokenizer.nextTokenAsDouble();
306          vel[1] = tokenizer.nextTokenAsDouble();
307          vel[2] = tokenizer.nextTokenAsDouble();
308 <        
309 <        
310 <        Quat4d q;
311 <        if (integrableObject->isDirectional()) {
308 >        break;
309 >      }
310 >
311 >      case 'q' : {
312 >        if (sd->isDirectional()) {
313            
314            q[0] = tokenizer.nextTokenAsDouble();
315            q[1] = tokenizer.nextTokenAsDouble();
316            q[2] = tokenizer.nextTokenAsDouble();
317            q[3] = tokenizer.nextTokenAsDouble();
318 <        }  
319 <        // keep the position in case we need it for a molecular restraint:
318 >          
319 >          RealType qlen = q.length();
320 >          if (qlen < OpenMD::epsilon) { //check quaternion is not equal to 0
321 >            
322 >            sprintf(painCave.errMsg,
323 >                    "RestReader Error: initial quaternion error (q0^2 + q1^2 + q2^2 + q3^2) ~ 0\n");
324 >            painCave.isFatal = 1;
325 >            simError();            
326 >          }  
327 >              
328 >          q.normalize();
329 >        }          
330 >        break;
331 >      }  
332 >      case 'j' : {
333 >        Vector3d ji;
334 >        if (sd->isDirectional()) {
335 >          ji[0] = tokenizer.nextTokenAsDouble();
336 >          ji[1] = tokenizer.nextTokenAsDouble();
337 >          ji[2] = tokenizer.nextTokenAsDouble();
338 >        }
339 >        break;
340 >      }  
341 >      case 'f': {        
342 >        Vector3d force;
343 >        force[0] = tokenizer.nextTokenAsDouble();
344 >        force[1] = tokenizer.nextTokenAsDouble();
345 >        force[2] = tokenizer.nextTokenAsDouble();          
346 >        break;
347 >      }
348 >      case 't' : {        
349 >        Vector3d torque;
350 >        torque[0] = tokenizer.nextTokenAsDouble();
351 >        torque[1] = tokenizer.nextTokenAsDouble();
352 >        torque[2] = tokenizer.nextTokenAsDouble();          
353 >        break;
354 >      }
355 >      default: {
356 >        sprintf(painCave.errMsg,
357 >                "RestReader Error: %s is an unrecognized type\n", type.c_str());
358 >        painCave.isFatal = 1;
359 >        simError();    
360 >        break;  
361 >      }
362 >      }
363 >      // keep the position in case we need it for a molecular restraint:
364 >
365 >      all_pos_[index] = pos;      
366          
367 <        all_pos_[index] = pos;
368 <        
369 <        // is this io restrained?
370 <        GenericData* data = integrableObject->getPropertyByName("Restraint");
371 <        ObjectRestraint* oRest;
372 <        
373 <        if (data != NULL) {
374 <          // make sure we can reinterpret the generic data as restraint data:
349 <          RestraintData* restData= dynamic_cast<RestraintData*>(data);        
350 <          if (restData != NULL) {
351 <            // make sure we can reinterpet the restraint data as a pointer to
367 >      // is this io restrained?
368 >      GenericData* data = sd->getPropertyByName("Restraint");
369 >      
370 >      if (data != NULL) {
371 >        // make sure we can reinterpret the generic data as restraint data:
372 >        RestraintData* restData= dynamic_cast<RestraintData*>(data);        
373 >        if (restData != NULL) {
374 >          // make sure we can reinterpet the restraint data as a pointer to
375              // an ObjectRestraint:
376 <            oRest = dynamic_cast<ObjectRestraint*>(restData->getData());
377 <            if (oRest != NULL) {          
378 <              if (integrableObject->isDirectional()) {
379 <                oRest->setReferenceStructure(pos, q.toRotationMatrix3());
380 <              } else {                          
381 <                oRest->setReferenceStructure(pos);
359 <              }
376 >          ObjectRestraint* oRest = dynamic_cast<ObjectRestraint*>(restData->getData());
377 >          if (oRest != NULL) {          
378 >            if (sd->isDirectional()) {
379 >              oRest->setReferenceStructure(pos, q.toRotationMatrix3());
380 >            } else {                          
381 >              oRest->setReferenceStructure(pos);
382              }
383            }
384          }

Comparing trunk/src/io/RestReader.cpp (property svn:keywords):
Revision 1407 by cli2, Wed Jan 20 16:04:40 2010 UTC vs.
Revision 1938 by gezelter, Thu Oct 31 15:32:17 2013 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines