--- trunk/OOPSE/libmdtools/mdProfile.cpp 2003/12/19 20:36:35 891 +++ trunk/OOPSE/libmdtools/mdProfile.cpp 2004/05/27 00:48:12 1198 @@ -58,14 +58,14 @@ void initProfile( void ){ #endif //is_mpi } - strncpy( theNames[pro1].myName, "BASS Parse", MAX_PROFILE_NAMELENGTH ); - strncpy( theNames[pro2].myName, "SimSetup->CreateSim", MAX_PROFILE_NAMELENGTH ); - strncpy( theNames[pro3].myName, "Integrate the Sim", MAX_PROFILE_NAMELENGTH ); - strncpy( theNames[pro4].myName, "unamed4", MAX_PROFILE_NAMELENGTH ); - strncpy( theNames[pro5].myName, "unamed5", MAX_PROFILE_NAMELENGTH ); - strncpy( theNames[pro6].myName, "unamed6", MAX_PROFILE_NAMELENGTH ); - strncpy( theNames[pro7].myName, "unamed7", MAX_PROFILE_NAMELENGTH ); - strncpy( theNames[pro8].myName, "unamed8", MAX_PROFILE_NAMELENGTH ); + strncpy( theNames[pro1].myName, "Integrator->integrateStep()", MAX_PROFILE_NAMELENGTH ); + strncpy( theNames[pro2].myName, "Integrator->writes and stats", MAX_PROFILE_NAMELENGTH ); + strncpy( theNames[pro3].myName, "Integrator->preMove", MAX_PROFILE_NAMELENGTH ); + strncpy( theNames[pro4].myName, "Integrator->moveA", MAX_PROFILE_NAMELENGTH ); + strncpy( theNames[pro5].myName, "Integrator->CalcForce", MAX_PROFILE_NAMELENGTH ); + strncpy( theNames[pro6].myName, "Integrator->moveB", MAX_PROFILE_NAMELENGTH ); + strncpy( theNames[pro7].myName, "shortRange force calc", MAX_PROFILE_NAMELENGTH ); + strncpy( theNames[pro8].myName, "fortran force calc", MAX_PROFILE_NAMELENGTH ); } @@ -170,8 +170,8 @@ void writeProfiles( void ){ if( worldRank == 0 ){ - double *nodeTots = new double[mpiSim->getNumberProcessors()]; - double *nodePercentTots = new double[mpiSim->getNumberProcessors()]; + double *nodeTots = new double[mpiSim->getNprocessors()]; + double *nodePercentTots = new double[mpiSim->getNprocessors()]; totalTime = 0.0; for(i=0;igetNumberProcessors();j++){ + for(j=1;jgetNprocessors();j++){ nodeTime = 0.0; @@ -309,7 +309,7 @@ void writeProfiles( void ){ // print out the totals - for(j=0;jgetNumberProcessors();j++) + for(j=0;jgetNprocessors();j++) nodePercentTots[j] = nodeTots[j] / globalTime; for(i=0;igetNumberProcessors();j++){ + for(j=0;jgetNprocessors();j++){ fprintf(stdout, " %12G %14G node %d\n", @@ -374,7 +374,7 @@ void writeProfiles( void ){ else{ - for(j=1;jgetNumberProcessors();j++){ + for(j=1;jgetNprocessors();j++){ if( worldRank == j ){