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

Comparing trunk/OOPSE-4/src/applications/oopse/oopse.cpp (file contents):
Revision 2403 by chrisfen, Tue Nov 1 19:13:23 2005 UTC vs.
Revision 2560 by gezelter, Thu Jan 12 21:16:50 2006 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 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 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      }

Diff Legend

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