--- trunk/OOPSE/src/oopse.cpp 2003/04/03 20:21:54 447 +++ trunk/OOPSE/src/oopse.cpp 2003/12/19 18:53:43 888 @@ -6,6 +6,10 @@ #include #include +#ifdef PROFILE +#include "mdProfile.hpp" +#endif // PROFILE + #include "simError.h" #include "SimSetup.hpp" #include "SimInfo.hpp" @@ -19,8 +23,6 @@ int main(int argc,char* argv[]){ int main(int argc,char* argv[]){ - int i; - unsigned int n_atoms, eo, xo; char* in_name; SimSetup* startMe; SimInfo* entry_plug; @@ -29,9 +31,13 @@ int main(int argc,char* argv[]){ // first things first, all of the initializations MPI_Init( &argc, &argv ); // the MPI communicators + initSimError(); // the error handler srand48( 1337 ); // the random number generator. +#ifdef PROFILE + initProfile(); +#endif //profile // check command line arguments, and set the input file @@ -57,13 +63,37 @@ int main(int argc,char* argv[]){ startMe = new SimSetup; startMe->setSimInfo( entry_plug ); + +#ifdef PROFILE + startProfile( pro1 ); +#endif //profile + startMe->parseFile( in_name ); + +#ifdef PROFILE + endProfile( pro1 ); + + startProfile( pro2 ); +#endif //profile + startMe->createSim(); delete startMe; + +#ifdef PROFILE + endProfile( pro2 ); + startProfile( pro3 ); +#endif //profile + entry_plug->the_integrator->integrate(); +#ifdef PROFILE + endProfile( pro3 ); + + writeProfiles(); +#endif //profile + strcpy( checkPointMsg, "Oh what a lovely Tea Party!" ); MPIcheckPoint();