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

Comparing:
trunk/src/io/DumpReader.cpp (file contents), Revision 1025 by gezelter, Wed Aug 30 20:33:44 2006 UTC vs.
branches/development/src/io/DumpReader.cpp (file contents), Revision 1764 by gezelter, Tue Jul 3 18:32:27 2012 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 < */
1 > /*
2 > * Copyright (c) 2009 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. Redistributions of source code must retain the above copyright
10 > *    notice, this list of conditions and the following disclaimer.
11 > *
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.
16 > *
17 > * This software is provided "AS IS," without a warranty of any
18 > * kind. All express or implied conditions, representations and
19 > * warranties, including any implied warranty of merchantability,
20 > * fitness for a particular purpose or non-infringement, are hereby
21 > * excluded.  The University of Notre Dame and its licensors shall not
22 > * be liable for any damages suffered by licensee as a result of
23 > * using, modifying or distributing the software or its
24 > * derivatives. In no event will the University of Notre Dame or its
25 > * licensors be liable for any lost revenue, profit or data, or for
26 > * direct, indirect, special, consequential, incidental or punitive
27 > * damages, however caused and regardless of the theory of liability,
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   #define _LARGEFILE_SOURCE64
44   #define _FILE_OFFSET_BITS 64
# Line 57 | Line 58
58   #include "utils/simError.h"
59   #include "utils/MemoryUtils.hpp"
60   #include "utils/StringTokenizer.hpp"
61 + #include "brains/Thermo.hpp"
62  
63   #ifdef IS_MPI
62
64   #include <mpi.h>
65 < #define TAKE_THIS_TAG_CHAR 0
65 < #define TAKE_THIS_TAG_INT 1
65 > #endif
66  
67 #endif // is_mpi
67  
68 <
70 < namespace oopse {
68 > namespace OpenMD {
69    
70    DumpReader::DumpReader(SimInfo* info, const std::string& filename)
71 <    : info_(info), filename_(filename), isScanned_(false), nframes_(0) {
71 >    : info_(info), filename_(filename), isScanned_(false), nframes_(0), needCOMprops_(false) {
72      
73   #ifdef IS_MPI
74      
# Line 92 | Line 90 | namespace oopse {
90      }
91      
92      strcpy(checkPointMsg, "Dump file opened for reading successfully.");
93 <    MPIcheckPoint();
93 >    errorCheckPoint();
94      
95   #endif
96      
# Line 113 | Line 111 | namespace oopse {
111      }
112      
113      strcpy(checkPointMsg, "Dump file closed successfully.");
114 <    MPIcheckPoint();
114 >    errorCheckPoint();
115      
116   #endif
117      
# Line 142 | Line 140 | namespace oopse {
140        prevPos = currPos;
141        bool foundOpenSnapshotTag = false;
142        bool foundClosedSnapshotTag = false;
143 +      bool foundOpenSiteDataTag = false;
144        while(inFile_->getline(buffer, bufferSize)) {
145          ++lineNo;
146          
# Line 240 | Line 239 | namespace oopse {
239      }
240      
241      readSet(whichFrame);
242 +
243 +    if (needCOMprops_) {
244 +      Snapshot* s = info_->getSnapshotManager()->getCurrentSnapshot();
245 +      Thermo thermo(info_);
246 +      Vector3d com;
247 +
248 +      if (needPos_ && needVel_) {
249 +        Vector3d comvel;
250 +        Vector3d comw;
251 +        thermo.getComAll(com, comvel);
252 +        comw = thermo.getAngularMomentum();
253 +      } else {
254 +        com = thermo.getCom();
255 +      }                    
256 +    }
257    }
258    
259    void DumpReader::readSet(int whichFrame) {    
260      std::string line;
261  
262   #ifndef IS_MPI
249
263      inFile_->clear();  
264      inFile_->seekg(framePos_[whichFrame]);
265  
# Line 280 | Line 293 | namespace oopse {
293        int sendBufferSize;
294        MPI_Bcast(&sendBufferSize, 1, MPI_INT, masterNode, MPI_COMM_WORLD);    
295        char * recvBuffer = new char[sendBufferSize+1];
296 +      assert(recvBuffer);
297 +      recvBuffer[sendBufferSize] = '\0';
298        MPI_Bcast(recvBuffer, sendBufferSize, MPI_CHAR, masterNode, MPI_COMM_WORLD);    
299        sstream.str(recvBuffer);
300 +      delete [] recvBuffer;
301      }      
302  
303      std::istream& inputStream = sstream;  
# Line 305 | Line 321 | namespace oopse {
321  
322      inputStream.getline(buffer, bufferSize);
323      line = buffer;
324 <    if (line.find("</Snapshot>") == std::string::npos) {
325 <      sprintf(painCave.errMsg,
326 <              "DumpReader Error: can not find </Snapshot>\n");
327 <      painCave.isFatal = 1;
328 <      simError();
329 <    }        
330 <  
324 >
325 >    if (line.find("<SiteData>") != std::string::npos) {
326 >      //read SiteData
327 >      readSiteData(inputStream);        
328 >    } else {
329 >      if (line.find("</Snapshot>") == std::string::npos) {
330 >        sprintf(painCave.errMsg,
331 >                "DumpReader Error: can not find </Snapshot>\n");
332 >        painCave.isFatal = 1;
333 >        simError();
334 >      }        
335 >    }
336    }
337    
338    void DumpReader::parseDumpLine(const std::string& line) {
# Line 322 | Line 343 | namespace oopse {
343      
344      nTokens = tokenizer.countTokens();
345      
346 <    if (nTokens < 2) {
346 >    if (nTokens < 2) {  
347        sprintf(painCave.errMsg,
348                "DumpReader Error: Not enough Tokens.\n%s\n", line.c_str());
349        painCave.isFatal = 1;
# Line 338 | Line 359 | namespace oopse {
359      }
360      std::string type = tokenizer.nextToken();
361      int size = type.size();
362 +
363 +    size_t found;
364 +    
365 +    if (needPos_) {
366 +      found = type.find("p");      
367 +      if (found == std::string::npos) {
368 +        sprintf(painCave.errMsg,
369 +                "DumpReader Error: StuntDouble %d has no Position\n"
370 +                "\tField (\"p\") specified.\n%s\n", index,
371 +                line.c_str());  
372 +        painCave.isFatal = 1;
373 +        simError();
374 +      }
375 +    }
376 +    
377 +    if (integrableObject->isDirectional()) {
378 +      if (needQuaternion_) {
379 +        found = type.find("q");      
380 +        if (found == std::string::npos) {
381 +          sprintf(painCave.errMsg,
382 +                  "DumpReader Error: Directional StuntDouble %d has no\n"
383 +                  "\tQuaternion Field (\"q\") specified.\n%s\n", index,
384 +                  line.c_str());  
385 +          painCave.isFatal = 1;
386 +          simError();
387 +        }
388 +      }      
389 +    }
390 +
391      for(int i = 0; i < size; ++i) {
392        switch(type[i]) {
393          
# Line 372 | Line 422 | namespace oopse {
422               q[3] = tokenizer.nextTokenAsDouble();
423                
424               RealType qlen = q.length();
425 <             if (qlen < oopse::epsilon) { //check quaternion is not equal to 0
425 >             if (qlen < OpenMD::epsilon) { //check quaternion is not equal to 0
426                  
427                 sprintf(painCave.errMsg,
428                         "DumpReader Error: initial quaternion error (q0^2 + q1^2 + q2^2 + q3^2) ~ 0\n");
# Line 398 | Line 448 | namespace oopse {
448                 integrableObject->setJ(ji);
449               }
450            }
451 +          break;
452          }  
453          case 'f': {
454  
# Line 417 | Line 468 | namespace oopse {
468             integrableObject->setTrq(torque);          
469             break;
470          }
471 +        case 'u' : {
472 +
473 +           RealType particlePot;
474 +           particlePot = tokenizer.nextTokenAsDouble();
475 +           integrableObject->setParticlePot(particlePot);          
476 +           break;
477 +        }
478 +        case 'c' : {
479 +
480 +           RealType flucQPos;
481 +           flucQPos = tokenizer.nextTokenAsDouble();
482 +           integrableObject->setFlucQPos(flucQPos);          
483 +           break;
484 +        }
485 +        case 'w' : {
486 +
487 +           RealType flucQVel;
488 +           flucQVel = tokenizer.nextTokenAsDouble();
489 +           integrableObject->setFlucQVel(flucQVel);          
490 +           break;
491 +        }
492 +        case 'g' : {
493 +
494 +           RealType flucQFrc;
495 +           flucQFrc = tokenizer.nextTokenAsDouble();
496 +           integrableObject->setFlucQFrc(flucQFrc);          
497 +           break;
498 +        }
499 +        case 'e' : {
500 +
501 +           Vector3d eField;
502 +           eField[0] = tokenizer.nextTokenAsDouble();
503 +           eField[1] = tokenizer.nextTokenAsDouble();
504 +           eField[2] = tokenizer.nextTokenAsDouble();          
505 +           integrableObject->setElectricField(eField);          
506 +           break;
507 +        }
508          default: {
509                 sprintf(painCave.errMsg,
510                         "DumpReader Error: %s is an unrecognized type\n", type.c_str());
# Line 431 | Line 519 | namespace oopse {
519    }
520    
521  
522 <  void  DumpReader::readStuntDoubles(std::istream& inputStream) {
522 >  void DumpReader::parseSiteLine(const std::string& line) {
523  
524 +    StringTokenizer tokenizer(line);
525 +    int nTokens;
526 +    
527 +    nTokens = tokenizer.countTokens();
528 +    
529 +    if (nTokens < 2) {  
530 +      sprintf(painCave.errMsg,
531 +              "DumpReader Error: Not enough Tokens.\n%s\n", line.c_str());
532 +      painCave.isFatal = 1;
533 +      simError();
534 +    }
535 +
536 +    /**
537 +     * The first token is the global integrable object index.
538 +     */
539 +
540 +    int index = tokenizer.nextTokenAsInt();
541 +    StuntDouble* integrableObject = info_->getIOIndexToIntegrableObject(index);
542 +    if (integrableObject == NULL) {
543 +      return;
544 +    }
545 +    StuntDouble* sd = integrableObject;
546 +
547 +    /**
548 +     * Test to see if the next token is an integer or not.  If not,
549 +     * we've got data on the integrable object itself.  If there is an
550 +     * integer, we're parsing data for a site on a rigid body.
551 +     */
552 +
553 +    std::string indexTest = tokenizer.peekNextToken();
554 +    std::istringstream i(indexTest);
555 +    int siteIndex;
556 +    if (i >> siteIndex) {
557 +      // chew up this token and parse as an int:
558 +      siteIndex = tokenizer.nextTokenAsInt();
559 +      RigidBody* rb = static_cast<RigidBody*>(integrableObject);
560 +      sd = rb->getAtoms()[siteIndex];
561 +    }
562 +
563 +    /**
564 +     * The next token contains information on what follows.
565 +     */
566 +    std::string type = tokenizer.nextToken();
567 +    int size = type.size();
568 +    
569 +    for(int i = 0; i < size; ++i) {
570 +      switch(type[i]) {
571 +        
572 +      case 'u' : {
573 +        
574 +        RealType particlePot;
575 +        particlePot = tokenizer.nextTokenAsDouble();
576 +        sd->setParticlePot(particlePot);
577 +        break;
578 +      }
579 +      case 'c' : {
580 +        
581 +        RealType flucQPos;
582 +        flucQPos = tokenizer.nextTokenAsDouble();
583 +        sd->setFlucQPos(flucQPos);
584 +        break;
585 +      }
586 +      case 'w' : {
587 +        
588 +        RealType flucQVel;
589 +        flucQVel = tokenizer.nextTokenAsDouble();
590 +        sd->setFlucQVel(flucQVel);
591 +        break;
592 +      }
593 +      case 'g' : {
594 +        
595 +        RealType flucQFrc;
596 +        flucQFrc = tokenizer.nextTokenAsDouble();
597 +        sd->setFlucQFrc(flucQFrc);
598 +        break;
599 +      }
600 +      case 'e' : {
601 +        
602 +        Vector3d eField;
603 +        eField[0] = tokenizer.nextTokenAsDouble();
604 +        eField[1] = tokenizer.nextTokenAsDouble();
605 +        eField[2] = tokenizer.nextTokenAsDouble();  
606 +        sd->setElectricField(eField);          
607 +        break;
608 +      }
609 +      default: {
610 +        sprintf(painCave.errMsg,
611 +                "DumpReader Error: %s is an unrecognized type\n", type.c_str());
612 +        painCave.isFatal = 1;
613 +        simError();
614 +        break;  
615 +      }
616 +      }
617 +    }    
618 +  }
619 +  
620 +  
621 +  void  DumpReader::readStuntDoubles(std::istream& inputStream) {
622 +    
623      inputStream.getline(buffer, bufferSize);
624      std::string line(buffer);
625      
# Line 455 | Line 642 | namespace oopse {
642    
643    }
644  
645 +  void  DumpReader::readSiteData(std::istream& inputStream) {
646 +
647 +    inputStream.getline(buffer, bufferSize);
648 +    std::string line(buffer);
649 +    
650 +    if (line.find("<SiteData>") == std::string::npos) {
651 +      // site data isn't required for a simulation, so skip
652 +      return;
653 +    }
654 +
655 +    while(inputStream.getline(buffer, bufferSize)) {
656 +      line = buffer;
657 +      
658 +      if(line.find("</SiteData>") != std::string::npos) {
659 +        break;
660 +      }
661 +
662 +      parseSiteLine(line);
663 +    }
664 +  
665 +  }
666 +
667    void DumpReader::readFrameProperties(std::istream& inputStream) {
668  
669      Snapshot* s = info_->getSnapshotManager()->getCurrentSnapshot();
# Line 500 | Line 709 | namespace oopse {
709          hmat(2, 2) = tokenizer.nextTokenAsDouble();
710          s->setHmat(hmat);      
711        } else if (propertyName == "Thermostat") {
712 <        RealType chi = tokenizer.nextTokenAsDouble();
713 <        RealType integralOfChiDt = tokenizer.nextTokenAsDouble();
714 <        s->setChi(chi);
715 <        s->setIntegralOfChiDt(integralOfChiDt);        
712 >        pair<RealType, RealType> thermostat;
713 >        thermostat.first = tokenizer.nextTokenAsDouble();
714 >        thermostat.second = tokenizer.nextTokenAsDouble();
715 >        s->setThermostat(thermostat);
716       } else if (propertyName == "Barostat") {
717          Mat3x3d eta;
718          eta(0, 0) = tokenizer.nextTokenAsDouble();
# Line 515 | Line 724 | namespace oopse {
724          eta(2, 0) = tokenizer.nextTokenAsDouble();
725          eta(2, 1) = tokenizer.nextTokenAsDouble();
726          eta(2, 2) = tokenizer.nextTokenAsDouble();
727 <        s->setEta(eta);
727 >        s->setBarostat(eta);
728        } else {
729          sprintf(painCave.errMsg,
730                  "DumpReader Error: %s is an invalid property in <FrameData>\n", propertyName.c_str());
# Line 528 | Line 737 | namespace oopse {
737    }
738  
739    
740 < }//end namespace oopse
740 > }//end namespace OpenMD

Comparing:
trunk/src/io/DumpReader.cpp (property svn:keywords), Revision 1025 by gezelter, Wed Aug 30 20:33:44 2006 UTC vs.
branches/development/src/io/DumpReader.cpp (property svn:keywords), Revision 1764 by gezelter, Tue Jul 3 18:32:27 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines