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 1938 by gezelter, Thu Oct 31 15:32:17 2013 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
107 <      
108 <      delete inFile_;
106 > #endif
107 >
108 >      inFile_->~istream();
109        
110   #ifdef IS_MPI
111        
# Line 203 | Line 203 | namespace OpenMD {
203   #ifdef IS_MPI
204      }
205      
206 <    MPI::COMM_WORLD.Bcast(&nframes_, 1, MPI::INT, 0);
206 >    MPI_Bcast(&nframes_, 1, MPI_INT, 0, MPI_COMM_WORLD);
207      
208   #endif // is_mpi
209      
# Line 289 | Line 289 | namespace OpenMD {
289        }
290  
291        int sendBufferSize = sendBuffer.size();
292 <      MPI::COMM_WORLD.Bcast(&sendBufferSize, 1, MPI::INT, masterNode);    
293 <      MPI::COMM_WORLD.Bcast((void *)sendBuffer.c_str(), sendBufferSize,
294 <                            MPI::CHAR, masterNode);    
292 >      MPI_Bcast(&sendBufferSize, 1, MPI_INT, masterNode, MPI_COMM_WORLD);    
293 >      MPI_Bcast((void *)sendBuffer.c_str(), sendBufferSize,
294 >                MPI_CHAR, masterNode, MPI_COMM_WORLD);    
295        
296        sstream.str(sendBuffer);
297      } else {
298        int sendBufferSize;
299 <      MPI::COMM_WORLD.Bcast(&sendBufferSize, 1, MPI::INT, masterNode);
299 >      MPI_Bcast(&sendBufferSize, 1, MPI_INT, masterNode, MPI_COMM_WORLD);
300        char * recvBuffer = new char[sendBufferSize+1];
301        assert(recvBuffer);
302        recvBuffer[sendBufferSize] = '\0';
303 <      MPI::COMM_WORLD.Bcast(recvBuffer, sendBufferSize, MPI::CHAR, masterNode);
303 >      MPI_Bcast(recvBuffer, sendBufferSize, MPI_CHAR, masterNode, MPI_COMM_WORLD);
304        sstream.str(recvBuffer);
305        delete [] recvBuffer;
306      }      
# Line 510 | Line 510 | namespace OpenMD {
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: {
521                 sprintf(painCave.errMsg,
522                         "DumpReader Error: %s is an unrecognized type\n", type.c_str());
# Line 520 | Line 527 | namespace OpenMD {
527  
528        }
529      }
523 –    
530    }
531    
532  
# Line 613 | 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 625 | 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