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

Comparing trunk/src/applications/oopse/oopse.cpp (file contents):
Revision 510 by gezelter, Fri Apr 15 22:40:33 2005 UTC vs.
Revision 1241 by gezelter, Fri Apr 25 15:14:47 2008 UTC

# Line 1 | Line 1
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
# Line 44 | Line 44
44   #endif
45  
46   #include "utils/simError.h"
47 + #include "utils/CaseConversion.hpp"
48   #include "brains/Register.hpp"
49   #include "brains/SimCreator.hpp"
50   #include "brains/SimInfo.hpp"
# Line 52 | Line 53
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[]){
# Line 73 | Line 76 | 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 " <<
# Line 99 | Line 102 | int main(int argc,char* argv[]){
102    }
103   #endif
104    
102 #ifdef IS_MPI
105    strcpy( checkPointMsg, "Successful number of arguments" );
106 <  MPIcheckPoint();
105 < #endif
106 >  errorCheckPoint();
107  
107
108
108    //register forcefields, integrators and minimizers
109    registerAll();
110  
# Line 122 | Line 121 | int main(int argc,char* argv[]){
121      
122    if (simParams->haveMinimizer()) {
123      //create minimizer
124 <    Minimizer* myMinimizer = MinimizerFactory::getInstance()->createMinimizer(simParams->getMinimizer(), info);
124 >    Minimizer* myMinimizer = MinimizerFactory::getInstance()->createMinimizer(toUpperCopy(simParams->getMinimizer()), info);
125  
126      if (myMinimizer == NULL) {
127        sprintf(painCave.errMsg, "Minimizer Factory can not create %s Minimizer\n",
128 <              simParams->getMinimizer());
128 >              simParams->getMinimizer().c_str());
129        painCave.isFatal = 1;
130        simError();
131      }
# Line 136 | Line 135 | int main(int argc,char* argv[]){
135    } else if (simParams->haveEnsemble()) {
136      //create Integrator
137  
138 <    Integrator* myIntegrator = IntegratorFactory::getInstance()->createIntegrator(simParams->getEnsemble(), info);
139 <
138 >    Integrator* myIntegrator = IntegratorFactory::getInstance()->createIntegrator(toUpperCopy(simParams->getEnsemble()), info);
139 >
140      if (myIntegrator == NULL) {
141        sprintf(painCave.errMsg, "Integrator Factory can not create %s Integrator\n",
142 <              simParams->getEnsemble());
142 >              simParams->getEnsemble().c_str());
143        painCave.isFatal = 1;
144        simError();
145      }
146                  
147      //Thermodynamic Integration Method
148 <    //ForceManager* fman = new ThermodynamicForceManager(info);
149 <    //myIntegrator->setForceManager(fman);
148 >    //set the force manager for thermodynamic integration if specified
149 >    if (simParams->getUseSolidThermInt() || simParams->getUseLiquidThermInt()){
150 >      ForceManager* fman = new ThermoIntegrationForceManager(info);
151 >      myIntegrator->setForceManager(fman);
152 >    }
153  
152
154      //Zconstraint-Method
155 <    if (simParams->haveZconstraints()) {
156 <      info->setNZconstraint(simParams->getNzConstraints());
155 >    if (simParams->getNZconsStamps() > 0) {
156 >      info->setNZconstraint(simParams->getNZconsStamps());
157        ForceManager* fman = new ZconstraintForceManager(info);
158        myIntegrator->setForceManager(fman);
159      }
# Line 161 | Line 162 | int main(int argc,char* argv[]){
162      delete myIntegrator;
163    }else {
164      sprintf(painCave.errMsg, "Integrator Factory can not create %s Integrator\n",
165 <            simParams->getEnsemble());
165 >            simParams->getEnsemble().c_str());
166      painCave.isFatal = 1;
167      simError();
168    }
# Line 170 | Line 171 | int main(int argc,char* argv[]){
171      
172    delete info;
173  
174 < #ifdef IS_MPI
175 <  strcpy( checkPointMsg, "Oh what a lovely Tea Party!" );
176 <  MPIcheckPoint();
177 <  
174 >
175 >  strcpy( checkPointMsg, "Great googly moogly!  It worked!" );
176 >  errorCheckPoint();
177 >
178 > #ifdef IS_MPI  
179    MPI_Finalize();
180   #endif
181  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines