| 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 | 
  | 
  | 
| 59 | 
  | 
 | 
| 60 | 
  | 
using namespace OpenMD; | 
| 61 | 
  | 
 | 
| 62 | 
– | 
 | 
| 62 | 
  | 
int main(int argc,char* argv[]){ | 
| 63 | 
  | 
   | 
| 64 | 
  | 
  // first things first, all of the initializations | 
| 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 | 
| 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"<< | 
| 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"; | 
| 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(); |