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

Comparing trunk/src/applications/openmd/openmd.cpp (file contents):
Revision 1458 by gezelter, Mon Jun 28 20:07:12 2010 UTC vs.
Revision 1526 by kstocke1, Wed Nov 24 17:40:12 2010 UTC

# Line 59 | Line 59 | using namespace OpenMD;
59  
60   using namespace OpenMD;
61  
62 – char* __get_svn_version();
63 –
62   int main(int argc,char* argv[]){
63    
64    // first things first, all of the initializations
# Line 71 | Line 69 | int main(int argc,char* argv[]){
69    
70    initSimError();           // the error handler
71    srand48( 1337 );          // the random number generator.
72 <  
72 >
73 >  std::string svnrev;
74 >  //convert a macro from compiler to a string in c++
75 >  STR_DEFINE(svnrev, SVN_REV );
76 >
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
# Line 84 | Line 94 | int main(int argc,char* argv[]){
94        "  | \\____/ .___/\\___/_/ /_//_/  /_//_____/    Copyright 2004-2010 by the  |\n"<<
95        "  |     /_/                                   University of Notre Dame.   |\n"<<
96        "  |                                                                       |\n"<<
97 <      "  |            version " <<
98 <      OPENMD_VERSION_MAJOR << "." << OPENMD_VERSION_MINOR << "  Revision:" << __get_svn_version() <<
97 >      "  |        version " <<
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"<<
# Line 147 | Line 157 | int main(int argc,char* argv[]){
157      Integrator* myIntegrator = IntegratorFactory::getInstance()->createIntegrator(toUpperCopy(simParams->getEnsemble()), info);
158  
159      if (myIntegrator == NULL) {
160 <      sprintf(painCave.errMsg, "Integrator Factory can not create %s Integrator\n",
160 >      sprintf(painCave.errMsg, "Integrator Factory cannot create %s Integrator\n",
161                simParams->getEnsemble().c_str());
162        painCave.isFatal = 1;
163        simError();
# Line 194 | Line 204 | int main(int argc,char* argv[]){
204  
205    return 0 ;
206   }
197 –
198 –  char svnVersionString[1024];
199 –  char* __get_svn_version(){
200 –    int howMuchToCopy=0;
201 –    const char *theVersion="$Revision$";
202 –    howMuchToCopy=strlen(theVersion+11) - 2;
203 –    assert(howMuchToCopy>0);
204 –    memcpy(svnVersionString,  theVersion+11, howMuchToCopy);
205 –    svnVersionString[howMuchToCopy] = '\0';
206 –    return svnVersionString;
207 –  }

Diff Legend

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