# | 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 74 | Line 74 | int main(int argc,char* argv[]){ | |
74 | " | ____ ____ ____ _____ ______ The OpenSource, Object-oriented |\n" << | |
75 | " | / __ \\/ __ \\/ __ \\/ ___// ____/ Parallel Simulation Engine. |\n" << | |
76 | " | / / / / / / / /_/ /\\__ \\/ __/ |\n" << | |
77 | < | " | / /_/ / /_/ / ____/___/ / /___ Copyright 2004-2005 by the |\n" << |
77 | > | " | / /_/ / /_/ / ____/___/ / /___ Copyright 2004-2006 by the |\n" << |
78 | " | \\____/\\____/_/ /____/_____/ University of Notre Dame. |\n" << | |
79 | " | |\n" << | |
80 | " | version " << | |
# | Line 138 | Line 138 | int main(int argc,char* argv[]){ | |
138 | //create Integrator | |
139 | ||
140 | Integrator* myIntegrator = IntegratorFactory::getInstance()->createIntegrator(toUpperCopy(simParams->getEnsemble()), info); | |
141 | < | |
141 | > | |
142 | if (myIntegrator == NULL) { | |
143 | sprintf(painCave.errMsg, "Integrator Factory can not create %s Integrator\n", | |
144 | simParams->getEnsemble().c_str()); | |
# | Line 152 | Line 152 | int main(int argc,char* argv[]){ | |
152 | ||
153 | ||
154 | //Zconstraint-Method | |
155 | < | if (simParams->haveNZconstraints()) { |
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 | } |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |