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 770 by tim, Fri Dec 2 15:38:03 2005 UTC vs.
Revision 1290 by cli2, Wed Sep 10 19:51:45 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 43 | Line 43
43   #include <mpi.h>
44   #endif
45  
46 + #include <fstream>
47   #include "utils/simError.h"
48   #include "utils/CaseConversion.hpp"
49   #include "brains/Register.hpp"
# Line 53 | Line 54
54   #include "integrators/Integrator.hpp"
55   #include "minimizers/MinimizerFactory.hpp"
56   #include "minimizers/Minimizer.hpp"
57 + #include "restraints/ThermoIntegrationForceManager.hpp"
58 +
59   using namespace oopse;
60  
61 +
62   int main(int argc,char* argv[]){
63 <  
63 >  
64    // first things first, all of the initializations
65  
66   #ifdef IS_MPI
# Line 74 | Line 78 | int main(int argc,char* argv[]){
78        "  |    ____  ____  ____  _____ ______  The OpenSource, Object-oriented   |\n" <<
79        "  |   / __ \\/ __ \\/ __ \\/ ___// ____/  Parallel Simulation Engine.       |\n" <<
80        "  |  / / / / / / / /_/ /\\__ \\/ __/                                       |\n" <<
81 <      "  | / /_/ / /_/ / ____/___/ / /___     Copyright 2004-2005 by the        |\n" <<
81 >      "  | / /_/ / /_/ / ____/___/ / /___     Copyright 2004-2008 by the        |\n" <<
82        "  | \\____/\\____/_/    /____/_____/     University of Notre Dame.         |\n" <<
83        "  |                                                                      |\n" <<
84        "  |                     version " <<
# Line 100 | Line 104 | int main(int argc,char* argv[]){
104    }
105   #endif
106    
103 #ifdef IS_MPI
107    strcpy( checkPointMsg, "Successful number of arguments" );
108 <  MPIcheckPoint();
106 < #endif
108 >  errorCheckPoint();
109  
108
109
110    //register forcefields, integrators and minimizers
111    registerAll();
112  
# Line 147 | Line 147 | int main(int argc,char* argv[]){
147      }
148                  
149      //Thermodynamic Integration Method
150 <    //ForceManager* fman = new ThermodynamicForceManager(info);
151 <    //myIntegrator->setForceManager(fman);
150 >    //set the force manager for thermodynamic integration if specified
151 >    if (simParams->getUseSolidThermInt() || simParams->getUseLiquidThermInt()){
152 >      ForceManager* fman = new ThermoIntegrationForceManager(info);
153 >      myIntegrator->setForceManager(fman);
154 >    }
155  
153
156      //Zconstraint-Method
157      if (simParams->getNZconsStamps() > 0) {
158        info->setNZconstraint(simParams->getNZconsStamps());
# Line 171 | Line 173 | int main(int argc,char* argv[]){
173      
174    delete info;
175  
176 < #ifdef IS_MPI
177 <  strcpy( checkPointMsg, "Yoikes!  It worked!" );
178 <  MPIcheckPoint();
179 <  
176 >
177 >  strcpy( checkPointMsg, "Great googly moogly!  It worked!" );
178 >  errorCheckPoint();
179 >
180 > #ifdef IS_MPI  
181    MPI_Finalize();
182   #endif
183  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines