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

Comparing trunk/src/brains/SimCreator.cpp (file contents):
Revision 816 by tim, Fri Dec 16 18:26:41 2005 UTC vs.
Revision 832 by tim, Fri Dec 30 15:32:55 2005 UTC

# Line 102 | Line 102 | Globals* SimCreator::parseFile(const std::string mdFil
102                  streamSize = ppStream.str().size() +1;
103                  commStatus = MPI_Bcast(&streamSize, 1, MPI_LONG, masterNode, MPI_COMM_WORLD);                  
104  
105 <                commStatus = MPI_Bcast(ppStream.str().c_str(), streamSize, MPI_CHAR, masterNode, MPI_COMM_WORLD);
105 >                commStatus = MPI_Bcast(static_cast<void*>(const_cast<char*>(ppStream.str().c_str())), streamSize, MPI_CHAR, masterNode, MPI_COMM_WORLD);
106              
107                  
108              } else {
# Line 224 | Line 224 | Globals* SimCreator::parseFile(const std::string mdFil
224      }
225      
226      ff->parse(forcefieldFileName);
227 <        
227 >    ff->setFortranForceOptions();
228      //create SimInfo
229      SimInfo * info = new SimInfo(ff, simParams);
230      

Diff Legend

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