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 1406 by gezelter, Wed Jan 20 02:27:24 2010 UTC vs.
branches/development/src/applications/openmd/openmd.cpp (file contents), Revision 1629 by gezelter, Wed Sep 14 21:15:17 2011 UTC

# Line 35 | Line 35
35   *                                                                      
36   * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).            
37   * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
38 < * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
38 > * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (2008).          
39   * [4]  Vardeman & Gezelter, in progress (2010).                        
40   */
41  
# Line 59 | Line 59 | using namespace OpenMD;
59  
60   using namespace OpenMD;
61  
62
62   int main(int argc,char* argv[]){
63    
64    // first things first, all of the initializations
# Line 70 | 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 80 | Line 91 | int main(int argc,char* argv[]){
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 << "." << OPENMD_VERSION_TINY <<
99 <      "           http://www.openmd.net       |\n"<<
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"<<
102        "  | any use whatsoever under a BSD-style license.                         |\n"<<
# Line 96 | Line 107 | int main(int argc,char* argv[]){
107        "  |                                                                       |\n"<<
108        "  | [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).              |\n"<<
109        "  | [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).           |\n"<<
110 <      "  | [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).           |\n"<<
110 >      "  | [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (2008).          |\n"<<
111        "  | [4]  Vardeman & Gezelter, in progress (2010).                         |\n"<<
112        "  +-----------------------------------------------------------------------+\n"<<
113        "\n";
# Line 119 | Line 130 | int main(int argc,char* argv[]){
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()) {
# Line 126 | Line 138 | int main(int argc,char* argv[]){
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);

Comparing:
trunk/src/applications/openmd/openmd.cpp (property svn:keywords), Revision 1406 by gezelter, Wed Jan 20 02:27:24 2010 UTC vs.
branches/development/src/applications/openmd/openmd.cpp (property svn:keywords), Revision 1629 by gezelter, Wed Sep 14 21:15:17 2011 UTC

# Line 0 | Line 1
1 + Revision

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines