| 70 |
|
initSimError(); // the error handler |
| 71 |
|
srand48( 1337 ); // the random number generator. |
| 72 |
|
|
| 73 |
< |
std::string revision; |
| 73 |
> |
std::string svnrev; |
| 74 |
|
//convert a macro from compiler to a string in c++ |
| 75 |
< |
STR_DEFINE(revision, SVN_REV ); |
| 76 |
< |
if (revision.empty()) revision.assign("release"); |
| 75 |
> |
STR_DEFINE(svnrev, SVN_REV ); |
| 76 |
|
|
| 77 |
< |
revision.resize(8,' '); |
| 77 |
> |
std::string revision; |
| 78 |
|
|
| 79 |
+ |
if (!svnrev.empty()) { |
| 80 |
+ |
revision.assign(" Revision: " + svnrev); |
| 81 |
+ |
} |
| 82 |
+ |
|
| 83 |
+ |
revision.resize(19,' '); |
| 84 |
+ |
|
| 85 |
|
#ifdef IS_MPI |
| 86 |
|
if( worldRank == 0 ){ |
| 87 |
|
#endif |
| 91 |
|
" | / __ \\____ ___ ____ / |/ // __ \\ The Open Molecular Dynamics |\n"<< |
| 92 |
|
" | / / / / __ \\/ _ \\/ __ \\ / /|_/ // / / / Engine (formerly OOPSE). |\n"<< |
| 93 |
|
" | / /_/ / /_/ / __/ / / // / / // /_/ / |\n"<< |
| 94 |
< |
" | \\____/ .___/\\___/_/ /_//_/ /_//_____/ Copyright 2004-2010 by the |\n"<< |
| 94 |
> |
" | \\____/ .___/\\___/_/ /_//_/ /_//_____/ Copyright 2004-2011 by the |\n"<< |
| 95 |
|
" | /_/ University of Notre Dame. |\n"<< |
| 96 |
|
" | |\n"<< |
| 97 |
|
" | version " << |
| 98 |
< |
OPENMD_VERSION_MAJOR << "." << OPENMD_VERSION_MINOR << " Revision:" << revision << |
| 98 |
> |
OPENMD_VERSION_MAJOR << "." << OPENMD_VERSION_MINOR << revision << |
| 99 |
|
" http://www.openmd.net |\n"<< |
| 100 |
|
" | |\n"<< |
| 101 |
|
" | OpenMD is an OpenScience project. All source code is available for |\n"<< |
| 130 |
|
//create simulation model |
| 131 |
|
SimCreator creator; |
| 132 |
|
SimInfo* info = creator.createSim(argv[1]); |
| 133 |
+ |
|
| 134 |
|
Globals* simParams = info->getSimParams(); |
| 135 |
|
|
| 136 |
|
if (simParams->haveMinimizer() && simParams->haveEnsemble()) { |
| 138 |
|
painCave.isFatal = 1; |
| 139 |
|
simError(); |
| 140 |
|
} |
| 141 |
< |
|
| 141 |
> |
|
| 142 |
> |
|
| 143 |
|
if (simParams->haveMinimizer()) { |
| 144 |
|
//create minimizer |
| 145 |
|
Minimizer* myMinimizer = MinimizerFactory::getInstance()->createMinimizer(toUpperCopy(simParams->getMinimizer()), info); |
