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 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC vs.
branches/development/src/applications/openmd/openmd.cpp (file contents), Revision 1496 by chuckv, Wed Sep 8 20:42:24 2010 UTC

# Line 1 | Line 1
1   /*
2 < * Copyright (c) 2009 The University of Notre Dame. All Rights Reserved.
2 > * Copyright (c) 2010 The University of Notre Dame. All Rights Reserved.
3   *
4   * The University of Notre Dame grants you ("Licensee") a
5   * non-exclusive, royalty free, license to use, modify and
# 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).          
39 < * [4]  Vardeman & Gezelter, in progress (2009).                        
38 > * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (2008).          
39 > * [4]  Vardeman & Gezelter, in progress (2010).                        
40   */
41  
42   #ifdef IS_MPI
# 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 80 | Line 93 | int main(int argc,char* argv[]){
93        "  |   / __ \\____  ___  ____   /  |/  // __ \\  The Open Molecular Dynamics |\n"<<
94        "  |  / / / / __ \\/ _ \\/ __ \\ / /|_/ // / / /  Engine (formerly OOPSE).    |\n"<<
95        "  | / /_/ / /_/ /  __/ / / // /  / // /_/ /                               |\n"<<
96 <      "  | \\____/ .___/\\___/_/ /_//_/  /_//_____/    Copyright 2004-2009 by the  |\n"<<
96 >      "  | \\____/ .___/\\___/_/ /_//_/  /_//_____/    Copyright 2004-2010 by the  |\n"<<
97        "  |     /_/                                   University of Notre Dame.   |\n"<<
98        "  |                                                                       |\n"<<
99 <      "  |                   version " <<
100 <      OPENMD_VERSION_MAJOR << "." << OPENMD_VERSION_MINOR << "." << OPENMD_VERSION_TINY <<
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 96 | Line 109 | int main(int argc,char* argv[]){
109        "  |                                                                       |\n"<<
110        "  | [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).              |\n"<<
111        "  | [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).           |\n"<<
112 <      "  | [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).           |\n"<<
113 <      "  | [4]  Vardeman & Gezelter, in progress (2009).                         |\n"<<
112 >      "  | [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (2008).          |\n"<<
113 >      "  | [4]  Vardeman & Gezelter, in progress (2010).                         |\n"<<
114        "  +-----------------------------------------------------------------------+\n"<<
115        "\n";
116      
# Line 126 | Line 139 | int main(int argc,char* argv[]){
139      painCave.isFatal = 1;
140      simError();        
141    }
142 <    
142 >  
143 >
144    if (simParams->haveMinimizer()) {
145      //create minimizer
146      Minimizer* myMinimizer = MinimizerFactory::getInstance()->createMinimizer(toUpperCopy(simParams->getMinimizer()), info);

Comparing:
trunk/src/applications/openmd/openmd.cpp (property svn:keywords), Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC vs.
branches/development/src/applications/openmd/openmd.cpp (property svn:keywords), Revision 1496 by chuckv, Wed Sep 8 20:42:24 2010 UTC

# Line 0 | Line 1
1 + Revision

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines