--- trunk/src/applications/openmd/openmd.cpp 2010/01/20 02:27:24 1406 +++ trunk/src/applications/openmd/openmd.cpp 2011/07/25 17:30:53 1596 @@ -35,7 +35,7 @@ * * [1] Meineke, et al., J. Comp. Chem. 26, 252-271 (2005). * [2] Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006). - * [3] Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008). + * [3] Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (2008). * [4] Vardeman & Gezelter, in progress (2010). */ @@ -59,7 +59,6 @@ using namespace OpenMD; using namespace OpenMD; - int main(int argc,char* argv[]){ // first things first, all of the initializations @@ -70,7 +69,19 @@ int main(int argc,char* argv[]){ initSimError(); // the error handler srand48( 1337 ); // the random number generator. - + + std::string svnrev; + //convert a macro from compiler to a string in c++ + STR_DEFINE(svnrev, SVN_REV ); + + std::string revision; + + if (!svnrev.empty()) { + revision.assign(" Revision: " + svnrev); + } + + revision.resize(19,' '); + #ifdef IS_MPI if( worldRank == 0 ){ #endif @@ -80,12 +91,12 @@ int main(int argc,char* argv[]){ " | / __ \\____ ___ ____ / |/ // __ \\ The Open Molecular Dynamics |\n"<< " | / / / / __ \\/ _ \\/ __ \\ / /|_/ // / / / Engine (formerly OOPSE). |\n"<< " | / /_/ / /_/ / __/ / / // / / // /_/ / |\n"<< - " | \\____/ .___/\\___/_/ /_//_/ /_//_____/ Copyright 2004-2010 by the |\n"<< + " | \\____/ .___/\\___/_/ /_//_/ /_//_____/ Copyright 2004-2011 by the |\n"<< " | /_/ University of Notre Dame. |\n"<< " | |\n"<< - " | version " << - OPENMD_VERSION_MAJOR << "." << OPENMD_VERSION_MINOR << "." << OPENMD_VERSION_TINY << - " http://www.openmd.net |\n"<< + " | version " << + OPENMD_VERSION_MAJOR << "." << OPENMD_VERSION_MINOR << revision << + " http://www.openmd.net |\n"<< " | |\n"<< " | OpenMD is an OpenScience project. All source code is available for |\n"<< " | any use whatsoever under a BSD-style license. |\n"<< @@ -96,7 +107,7 @@ int main(int argc,char* argv[]){ " | |\n"<< " | [1] Meineke, et al., J. Comp. Chem. 26, 252-271 (2005). |\n"<< " | [2] Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006). |\n"<< - " | [3] Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008). |\n"<< + " | [3] Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (2008). |\n"<< " | [4] Vardeman & Gezelter, in progress (2010). |\n"<< " +-----------------------------------------------------------------------+\n"<< "\n"; @@ -146,7 +157,7 @@ int main(int argc,char* argv[]){ Integrator* myIntegrator = IntegratorFactory::getInstance()->createIntegrator(toUpperCopy(simParams->getEnsemble()), info); if (myIntegrator == NULL) { - sprintf(painCave.errMsg, "Integrator Factory can not create %s Integrator\n", + sprintf(painCave.errMsg, "Integrator Factory cannot create %s Integrator\n", simParams->getEnsemble().c_str()); painCave.isFatal = 1; simError();