--- trunk/src/brains/SimCreator.cpp 2014/02/26 14:14:50 1969 +++ trunk/src/brains/SimCreator.cpp 2014/03/12 20:01:15 1976 @@ -64,6 +64,7 @@ #include "brains/ForceField.hpp" #include "utils/simError.h" #include "utils/StringUtils.hpp" +#include "utils/Revision.hpp" #include "math/SeqRandNumGen.hpp" #include "mdParser/MDLexer.hpp" #include "mdParser/MDParser.hpp" @@ -113,7 +114,7 @@ namespace OpenMD { #ifdef IS_MPI //broadcasting the stream size streamSize = ppStream.str().size() +1; - MPI_Bcast(&streamSize, 1, MPI_LONG, masterNode, MPI_COMM_WORLD); + MPI_Bcast(&streamSize, 1, MPI_INT, masterNode, MPI_COMM_WORLD); MPI_Bcast(static_cast(const_cast(ppStream.str().c_str())), streamSize, MPI_CHAR, masterNode, MPI_COMM_WORLD); @@ -127,7 +128,7 @@ namespace OpenMD { // MPI::COMM_WORLD.Bcast(&mdFileVersion, 1, MPI::INT, masterNode); //get stream size - MPI_Bcast(&streamSize, 1, MPI_LONG, masterNode, MPI_COMM_WORLD); + MPI_Bcast(&streamSize, 1, MPI_INT, masterNode, MPI_COMM_WORLD); // MPI::COMM_WORLD.Bcast(&streamSize, 1, MPI::LONG, masterNode); char* buf = new char[streamSize]; assert(buf); @@ -272,9 +273,9 @@ namespace OpenMD { version.append("."); version.append(OPENMD_VERSION_MINOR); - std::string svnrev; + std::string svnrev(g_REVISION, strnlen(g_REVISION, 20)); //convert a macro from compiler to a string in c++ - STR_DEFINE(svnrev, SVN_REV ); + // STR_DEFINE(svnrev, SVN_REV ); version.append(" Revision: "); // If there's no SVN revision, just call this the RELEASE revision. if (!svnrev.empty()) {