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

Comparing trunk/OOPSE/src/oopse.cpp (file contents):
Revision 892 by chuckv, Mon Dec 22 21:27:04 2003 UTC vs.
Revision 1169 by gezelter, Wed May 12 19:44:54 2004 UTC

# Line 17 | Line 17
17   #include "Integrator.hpp"
18   #include "Thermo.hpp"
19   #include "ReadWrite.hpp"
20 + #include "OOPSEMinimizer.hpp"
21  
22   char* program_name;
23   using namespace std;
# Line 26 | Line 27 | int main(int argc,char* argv[]){
27    char* in_name;
28    SimSetup* startMe;
29    SimInfo* entry_plug;
30 <
30 <  
30 >  
31    // first things first, all of the initializations
32  
33    MPI_Init( &argc, &argv ); // the MPI communicators
# Line 55 | Line 55 | int main(int argc,char* argv[]){
55  
56    strcpy( checkPointMsg, "Successful number of arguments" );
57    MPIcheckPoint();
58 <  
59 <  
58 >    
59    // create the simulation objects, and get the show on the road
60      
61    entry_plug = new SimInfo;
# Line 72 | Line 71 | int main(int argc,char* argv[]){
71  
72    delete startMe;
73  
74 +  if (!entry_plug->has_minimizer)
75 +    entry_plug->the_integrator->integrate();
76 +  else
77 +    entry_plug->the_minimizer->minimize();
78    
76 –  entry_plug->the_integrator->integrate();
77 –  
79   #ifdef PROFILE
80    writeProfiles();
81   #endif //profile

Diff Legend

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