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 507 by gezelter, Fri Apr 15 22:04:00 2005 UTC vs.
Revision 665 by tim, Thu Oct 13 22:26:47 2005 UTC

# Line 75 | Line 75 | int main(int argc,char* argv[]){
75        "  |  / / / / / / / /_/ /\\__ \\/ __/                                       |\n" <<
76        "  | / /_/ / /_/ / ____/___/ / /___     Copyright 2004-2005 by the        |\n" <<
77        "  | \\____/\\____/_/    /____/_____/     University of Notre Dame.         |\n" <<
78 –      "  |                                    http://www.oopse.org              |\n" <<
78        "  |                                                                      |\n" <<
79 +      "  |                     version " <<
80 +      OOPSE_VERSION_MAJOR << "." << OOPSE_VERSION_MINOR << "." << OOPSE_VERSION_TINY <<
81 +      "  http://www.oopse.org              |\n" <<
82 +      "  |                                                                      |\n" <<
83        "  | OOPSE is an OpenScience project.  All source code is available for   |\n" <<
84        "  | any use subject to only one condition:                               |\n" <<
85        "  |                                                                      |\n" <<
# Line 123 | Line 126 | int main(int argc,char* argv[]){
126  
127      if (myMinimizer == NULL) {
128        sprintf(painCave.errMsg, "Minimizer Factory can not create %s Minimizer\n",
129 <              simParams->getMinimizer());
129 >              simParams->getMinimizer().c_str());
130        painCave.isFatal = 1;
131        simError();
132      }
# Line 137 | Line 140 | int main(int argc,char* argv[]){
140  
141      if (myIntegrator == NULL) {
142        sprintf(painCave.errMsg, "Integrator Factory can not create %s Integrator\n",
143 <              simParams->getEnsemble());
143 >              simParams->getEnsemble().c_str());
144        painCave.isFatal = 1;
145        simError();
146      }
# Line 148 | Line 151 | int main(int argc,char* argv[]){
151  
152  
153      //Zconstraint-Method
154 <    if (simParams->haveZconstraints()) {
155 <      info->setNZconstraint(simParams->getNzConstraints());
154 >    if (simParams->haveNZconstraints()) {
155 >      info->setNZconstraint(simParams->getNZconstraints());
156        ForceManager* fman = new ZconstraintForceManager(info);
157        myIntegrator->setForceManager(fman);
158      }
# Line 158 | Line 161 | int main(int argc,char* argv[]){
161      delete myIntegrator;
162    }else {
163      sprintf(painCave.errMsg, "Integrator Factory can not create %s Integrator\n",
164 <            simParams->getEnsemble());
164 >            simParams->getEnsemble().c_str());
165      painCave.isFatal = 1;
166      simError();
167    }

Diff Legend

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