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 1969 by gezelter, Wed Feb 26 14:14:50 2014 UTC vs.
Revision 1976 by gezelter, Wed Mar 12 20:01:15 2014 UTC

# Line 64 | Line 64
64   #include "brains/ForceField.hpp"
65   #include "utils/simError.h"
66   #include "utils/StringUtils.hpp"
67 + #include "utils/Revision.hpp"
68   #include "math/SeqRandNumGen.hpp"
69   #include "mdParser/MDLexer.hpp"
70   #include "mdParser/MDParser.hpp"
# Line 113 | Line 114 | namespace OpenMD {
114   #ifdef IS_MPI            
115          //broadcasting the stream size
116          streamSize = ppStream.str().size() +1;
117 <        MPI_Bcast(&streamSize, 1, MPI_LONG, masterNode, MPI_COMM_WORLD);
117 >        MPI_Bcast(&streamSize, 1, MPI_INT, masterNode, MPI_COMM_WORLD);
118          MPI_Bcast(static_cast<void*>(const_cast<char*>(ppStream.str().c_str())),
119                    streamSize, MPI_CHAR, masterNode, MPI_COMM_WORLD);
120  
# Line 127 | Line 128 | namespace OpenMD {
128          // MPI::COMM_WORLD.Bcast(&mdFileVersion, 1, MPI::INT, masterNode);
129  
130          //get stream size
131 <        MPI_Bcast(&streamSize, 1, MPI_LONG, masterNode, MPI_COMM_WORLD);
131 >        MPI_Bcast(&streamSize, 1, MPI_INT, masterNode, MPI_COMM_WORLD);
132          // MPI::COMM_WORLD.Bcast(&streamSize, 1, MPI::LONG, masterNode);
133          char* buf = new char[streamSize];
134          assert(buf);
# Line 272 | Line 273 | namespace OpenMD {
273      version.append(".");
274      version.append(OPENMD_VERSION_MINOR);
275  
276 <    std::string svnrev;
276 >    std::string svnrev(g_REVISION, strnlen(g_REVISION, 20));
277      //convert a macro from compiler to a string in c++
278 <    STR_DEFINE(svnrev, SVN_REV );
278 >    // STR_DEFINE(svnrev, SVN_REV );
279      version.append(" Revision: ");
280      // If there's no SVN revision, just call this the RELEASE revision.
281      if (!svnrev.empty()) {

Diff Legend

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