58 |
|
#endif //is_mpi |
59 |
|
} |
60 |
|
|
61 |
< |
strncpy( theNames[pro1].myName, "BASS Parse", MAX_PROFILE_NAMELENGTH ); |
62 |
< |
strncpy( theNames[pro2].myName, "SimSetup->CreateSim", MAX_PROFILE_NAMELENGTH ); |
63 |
< |
strncpy( theNames[pro3].myName, "Integrate the Sim", MAX_PROFILE_NAMELENGTH ); |
64 |
< |
strncpy( theNames[pro4].myName, "unamed4", MAX_PROFILE_NAMELENGTH ); |
65 |
< |
strncpy( theNames[pro5].myName, "unamed5", MAX_PROFILE_NAMELENGTH ); |
66 |
< |
strncpy( theNames[pro6].myName, "unamed6", MAX_PROFILE_NAMELENGTH ); |
67 |
< |
strncpy( theNames[pro7].myName, "unamed7", MAX_PROFILE_NAMELENGTH ); |
68 |
< |
strncpy( theNames[pro8].myName, "unamed8", MAX_PROFILE_NAMELENGTH ); |
61 |
> |
strncpy( theNames[pro1].myName, "Integrator->integrateStep()", MAX_PROFILE_NAMELENGTH ); |
62 |
> |
strncpy( theNames[pro2].myName, "Integrator->writes and stats", MAX_PROFILE_NAMELENGTH ); |
63 |
> |
strncpy( theNames[pro3].myName, "Integrator->preMove", MAX_PROFILE_NAMELENGTH ); |
64 |
> |
strncpy( theNames[pro4].myName, "Integrator->moveA", MAX_PROFILE_NAMELENGTH ); |
65 |
> |
strncpy( theNames[pro5].myName, "Integrator->CalcForce", MAX_PROFILE_NAMELENGTH ); |
66 |
> |
strncpy( theNames[pro6].myName, "Integrator->moveB", MAX_PROFILE_NAMELENGTH ); |
67 |
> |
strncpy( theNames[pro7].myName, "shortRange force calc", MAX_PROFILE_NAMELENGTH ); |
68 |
> |
strncpy( theNames[pro8].myName, "fortran force calc", MAX_PROFILE_NAMELENGTH ); |
69 |
|
} |
70 |
|
|
71 |
|
|
170 |
|
|
171 |
|
if( worldRank == 0 ){ |
172 |
|
|
173 |
< |
double *nodeTots = new double[mpiSim->getNumberProcessors()]; |
174 |
< |
double *nodePercentTots = new double[mpiSim->getNumberProcessors()]; |
173 |
> |
double *nodeTots = new double[mpiSim->getNProcessors()]; |
174 |
> |
double *nodePercentTots = new double[mpiSim->getNProcessors()]; |
175 |
|
|
176 |
|
totalTime = 0.0; |
177 |
|
for(i=0;i<N_PROFILES;i++) |
236 |
|
globalAccum[i] = accumTime[i]; |
237 |
|
|
238 |
|
|
239 |
< |
for(j=1;j<mpiSim->getNumberProcessors();j++){ |
239 |
> |
for(j=1;j<mpiSim->getNProcessors();j++){ |
240 |
|
|
241 |
|
nodeTime = 0.0; |
242 |
|
|
309 |
|
|
310 |
|
// print out the totals |
311 |
|
|
312 |
< |
for(j=0;j<mpiSim->getNumberProcessors();j++) |
312 |
> |
for(j=0;j<mpiSim->getNProcessors();j++) |
313 |
|
nodePercentTots[j] = nodeTots[j] / globalTime; |
314 |
|
|
315 |
|
for(i=0;i<N_PROFILES;i++) |
335 |
|
"\n" |
336 |
|
"\n" ); |
337 |
|
|
338 |
< |
for(j=0;j<mpiSim->getNumberProcessors();j++){ |
338 |
> |
for(j=0;j<mpiSim->getNProcessors();j++){ |
339 |
|
|
340 |
|
fprintf(stdout, |
341 |
|
" %12G %14G node %d\n", |
374 |
|
|
375 |
|
else{ |
376 |
|
|
377 |
< |
for(j=1;j<mpiSim->getNumberProcessors();j++){ |
377 |
> |
for(j=1;j<mpiSim->getNProcessors();j++){ |
378 |
|
|
379 |
|
if( worldRank == j ){ |
380 |
|
|