--- trunk/OOPSE/src/oopse.cpp 2003/12/22 21:27:04 892 +++ trunk/OOPSE/src/oopse.cpp 2004/05/12 19:44:54 1169 @@ -17,6 +17,7 @@ #include "Integrator.hpp" #include "Thermo.hpp" #include "ReadWrite.hpp" +#include "OOPSEMinimizer.hpp" char* program_name; using namespace std; @@ -26,8 +27,7 @@ int main(int argc,char* argv[]){ char* in_name; SimSetup* startMe; SimInfo* entry_plug; - - + // first things first, all of the initializations MPI_Init( &argc, &argv ); // the MPI communicators @@ -55,8 +55,7 @@ int main(int argc,char* argv[]){ strcpy( checkPointMsg, "Successful number of arguments" ); MPIcheckPoint(); - - + // create the simulation objects, and get the show on the road entry_plug = new SimInfo; @@ -72,9 +71,11 @@ int main(int argc,char* argv[]){ delete startMe; + if (!entry_plug->has_minimizer) + entry_plug->the_integrator->integrate(); + else + entry_plug->the_minimizer->minimize(); - entry_plug->the_integrator->integrate(); - #ifdef PROFILE writeProfiles(); #endif //profile