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

Comparing trunk/src/io/DumpReader.cpp (file contents):
Revision 1969 by gezelter, Wed Feb 26 14:14:50 2014 UTC vs.
Revision 2000 by gezelter, Sat May 31 22:35:05 2014 UTC

# Line 103 | Line 103 | namespace OpenMD {
103   #ifdef IS_MPI
104      
105      if (worldRank == 0) {
106 < #endif
106 > #endif
107 >
108 >      inFile_->~istream();
109        
108 –      delete inFile_;
109 –      
110   #ifdef IS_MPI
111        
112      }
# Line 508 | Line 508 | namespace OpenMD {
508             eField[1] = tokenizer.nextTokenAsDouble();
509             eField[2] = tokenizer.nextTokenAsDouble();          
510             sd->setElectricField(eField);          
511 +           break;
512 +        }
513 +        case 's' : {
514 +
515 +           RealType sPot;
516 +           sPot = tokenizer.nextTokenAsDouble();
517 +           sd->setSitePotential(sPot);          
518             break;
519          }
520          default: {
# Line 612 | Line 619 | namespace OpenMD {
619          sd->setElectricField(eField);          
620          break;
621        }
622 +      case 's' : {
623 +        
624 +        RealType sPot;
625 +        sPot = tokenizer.nextTokenAsDouble();
626 +        sd->setSitePotential(sPot);          
627 +        break;
628 +      }
629        default: {
630          sprintf(painCave.errMsg,
631                  "DumpReader Error: %s is an unrecognized type\n", type.c_str());
# Line 624 | Line 638 | namespace OpenMD {
638    }
639    
640    
641 <  void  DumpReader::readStuntDoubles(std::istream& inputStream) {
641 >    void  DumpReader::readStuntDoubles(std::istream& inputStream) {
642      
643      inputStream.getline(buffer, bufferSize);
644      std::string line(buffer);

Diff Legend

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