| 1 | 
  | 
/* | 
| 2 | 
< | 
 * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved. | 
| 2 | 
> | 
 * Copyright (c) 2006 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 | 
| 53 | 
  | 
#include "integrators/Integrator.hpp" | 
| 54 | 
  | 
#include "minimizers/MinimizerFactory.hpp" | 
| 55 | 
  | 
#include "minimizers/Minimizer.hpp" | 
| 56 | 
+ | 
#include "restraints/ThermoIntegrationForceManager.hpp" | 
| 57 | 
+ | 
 | 
| 58 | 
  | 
using namespace oopse; | 
| 59 | 
  | 
 | 
| 60 | 
  | 
int main(int argc,char* argv[]){ | 
| 76 | 
  | 
      "  |    ____  ____  ____  _____ ______  The OpenSource, Object-oriented   |\n" << | 
| 77 | 
  | 
      "  |   / __ \\/ __ \\/ __ \\/ ___// ____/  Parallel Simulation Engine.       |\n" << | 
| 78 | 
  | 
      "  |  / / / / / / / /_/ /\\__ \\/ __/                                       |\n" << | 
| 79 | 
< | 
      "  | / /_/ / /_/ / ____/___/ / /___     Copyright 2004-2005 by the        |\n" << | 
| 79 | 
> | 
      "  | / /_/ / /_/ / ____/___/ / /___     Copyright 2004-2006 by the        |\n" << | 
| 80 | 
  | 
      "  | \\____/\\____/_/    /____/_____/     University of Notre Dame.         |\n" << | 
| 81 | 
  | 
      "  |                                                                      |\n" << | 
| 82 | 
  | 
      "  |                     version " <<  | 
| 140 | 
  | 
    //create Integrator | 
| 141 | 
  | 
 | 
| 142 | 
  | 
    Integrator* myIntegrator = IntegratorFactory::getInstance()->createIntegrator(toUpperCopy(simParams->getEnsemble()), info); | 
| 143 | 
< | 
 | 
| 143 | 
> | 
  | 
| 144 | 
  | 
    if (myIntegrator == NULL) { | 
| 145 | 
  | 
      sprintf(painCave.errMsg, "Integrator Factory can not create %s Integrator\n", | 
| 146 | 
  | 
              simParams->getEnsemble().c_str()); | 
| 149 | 
  | 
    } | 
| 150 | 
  | 
                 | 
| 151 | 
  | 
    //Thermodynamic Integration Method | 
| 152 | 
< | 
    //ForceManager* fman = new ThermodynamicForceManager(info); | 
| 153 | 
< | 
    //myIntegrator->setForceManager(fman); | 
| 152 | 
> | 
    //set the force manager for thermodynamic integration if specified | 
| 153 | 
> | 
    if (simParams->getUseSolidThermInt() || simParams->getUseLiquidThermInt()){ | 
| 154 | 
> | 
      ForceManager* fman = new ThermoIntegrationForceManager(info); | 
| 155 | 
> | 
      myIntegrator->setForceManager(fman); | 
| 156 | 
> | 
    } | 
| 157 | 
  | 
 | 
| 153 | 
– | 
 | 
| 158 | 
  | 
    //Zconstraint-Method | 
| 159 | 
< | 
    if (simParams->haveNZconstraints()) { | 
| 160 | 
< | 
      info->setNZconstraint(simParams->getNZconstraints()); | 
| 159 | 
> | 
    if (simParams->getNZconsStamps() > 0) { | 
| 160 | 
> | 
      info->setNZconstraint(simParams->getNZconsStamps()); | 
| 161 | 
  | 
      ForceManager* fman = new ZconstraintForceManager(info); | 
| 162 | 
  | 
      myIntegrator->setForceManager(fman); | 
| 163 | 
  | 
    } |