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

Comparing:
trunk/src/applications/openmd/openmd.cpp (file contents), Revision 1429 by gezelter, Tue Mar 30 15:25:09 2010 UTC vs.
branches/development/src/applications/openmd/openmd.cpp (file contents), Revision 1587 by gezelter, Fri Jul 8 20:25:32 2011 UTC

# Line 56 | Line 56
56   #include "minimizers/MinimizerFactory.hpp"
57   #include "minimizers/Minimizer.hpp"
58   #include "restraints/ThermoIntegrationForceManager.hpp"
59 + #include "utils/Report.hpp"
60 + #include "utils/Exception.hpp"
61  
62   using namespace OpenMD;
63  
62
64   int main(int argc,char* argv[]){
65    
66    // first things first, all of the initializations
# Line 70 | Line 71 | int main(int argc,char* argv[]){
71    
72    initSimError();           // the error handler
73    srand48( 1337 );          // the random number generator.
74 <  
74 >
75 >  std::string svnrev;
76 >  //convert a macro from compiler to a string in c++
77 >  STR_DEFINE(svnrev, SVN_REV );
78 >
79 >  std::string revision;
80 >
81 >  if (!svnrev.empty()) {
82 >     revision.assign("  Revision: " + svnrev);
83 >  }
84 >
85 >  revision.resize(19,' ');
86 >
87   #ifdef IS_MPI
88    if( worldRank == 0 ){
89   #endif
# Line 83 | Line 96 | int main(int argc,char* argv[]){
96        "  | \\____/ .___/\\___/_/ /_//_/  /_//_____/    Copyright 2004-2010 by the  |\n"<<
97        "  |     /_/                                   University of Notre Dame.   |\n"<<
98        "  |                                                                       |\n"<<
99 <      "  |                   version " <<
100 <      OPENMD_VERSION_MAJOR << "." << OPENMD_VERSION_MINOR << " Rev:" << __get_svn_version() <<
101 <      "           http://www.openmd.net       |\n"<<
99 >      "  |        version " <<
100 >      OPENMD_VERSION_MAJOR << "." << OPENMD_VERSION_MINOR << revision <<
101 >      "     http://www.openmd.net       |\n"<<
102        "  |                                                                       |\n"<<
103        "  | OpenMD is an OpenScience project.  All source code is available for   |\n"<<
104        "  | any use whatsoever under a BSD-style license.                         |\n"<<
# Line 119 | Line 132 | int main(int argc,char* argv[]){
132    //create simulation model
133    SimCreator creator;
134    SimInfo* info = creator.createSim(argv[1]);
135 +
136    Globals* simParams = info->getSimParams();
137  
138    if (simParams->haveMinimizer() && simParams->haveEnsemble()) {
# Line 126 | Line 140 | int main(int argc,char* argv[]){
140      painCave.isFatal = 1;
141      simError();        
142    }
143 <    
143 >  
144 >
145    if (simParams->haveMinimizer()) {
146      //create minimizer
147      Minimizer* myMinimizer = MinimizerFactory::getInstance()->createMinimizer(toUpperCopy(simParams->getMinimizer()), info);
# Line 193 | Line 208 | int main(int argc,char* argv[]){
208  
209    return 0 ;
210   }
196
197 extern "C" {
198  
199  char svnVersionString[1024];
200  char* __get_svn_version(){
201    int howMuchToCopy=0;
202    char *theVersion="$Revision$";
203    howMuchToCopy=strlen(theVersion+11) - 2;
204    assert(howMuchToCopy>0);
205    memcpy(svnVersionString,  theVersion+11, howMuchToCopy);
206    svnVersionString[howMuchToCopy] = '\0';
207    return svnVersionString;
208  }
209  
210 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines