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

Comparing branches/development/src/applications/openmd/openmd.cpp (file contents):
Revision 1465 by chuckv, Fri Jul 9 23:08:25 2010 UTC vs.
Revision 1629 by gezelter, Wed Sep 14 21:15:17 2011 UTC

# Line 91 | 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 " <<
# Line 130 | 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 137 | 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);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines