From 2c7d3af5932b1c8c2bec258467730e9111a4d260 Mon Sep 17 00:00:00 2001 From: Florian Wittkamp Date: Thu, 17 Nov 2016 12:54:05 +0100 Subject: [PATCH] Changed time measurement --- src/sofi3D.c | 43 +++++++++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/src/sofi3D.c b/src/sofi3D.c index 2f37c9e..5ae7955 100644 --- a/src/sofi3D.c +++ b/src/sofi3D.c @@ -121,11 +121,6 @@ int main(int argc, char **argv){ setvbuf(stdout, NULL, _IONBF, 0); - /* initialize clock for estimating runtime of program */ - if (MYID == 0){ - time1=MPI_Wtime(); - clock(); - } /* print program name, version, author etc to stdout*/ if (MYID == 0) info(stdout); @@ -768,13 +763,8 @@ int main(int argc, char **argv){ zb[0]=1; zb[1]=NZ; } - if (MYID==0){ - time2=MPI_Wtime(); - fprintf(FP,"\n\n\n **************************************************\n"); - fprintf(FP," *********** STARTING TIME STEPPING ***************\n"); - fprintf(FP," **************************************************\n"); - fprintf(FP," real time before starting time loop: %4.2f s.\n",time2-time1); - } + + for (ishot=1;ishot<=nshots;ishot++){ @@ -829,6 +819,23 @@ int main(int argc, char **argv){ lsamp=NDTSHIFT+1; nlsamp=1; + + + /* initialize clock for estimating runtime of program */ + if (MYID == 0){ + time1=MPI_Wtime(); + clock(); + } + + + if (MYID==0){ + time2=MPI_Wtime(); + fprintf(FP,"\n\n\n **************************************************\n"); + fprintf(FP," *********** STARTING TIME STEPPING ***************\n"); + fprintf(FP," **************************************************\n"); + fprintf(FP," real time before starting time loop: %4.2f s.\n",time2-time1); + } + for (nt=1;nt<=NT;nt++){ time_v_update[nt]=0.0; @@ -978,6 +985,14 @@ int main(int argc, char **argv){ } /* end of loop over timesteps */ /*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ + + + if (MYID==0){ + fprintf(FP,"\n **Info from main (written by PE %d): \n",MYID); + time4=MPI_Wtime(); + fprintf(FP," Total real time of the FD-Code: %4.2f seconds.\n",time4-time1); + } + fprintf(FP, "\n\n *********** Finish TIME STEPPING ****************\n"); fprintf(FP, " **************************************************\n\n"); @@ -1383,8 +1398,8 @@ int main(int argc, char **argv){ if (MYID==0){ fprintf(FP,"\n **Info from main (written by PE %d): \n",MYID); - time4=MPI_Wtime(); - fprintf(FP," Total real time of program: %4.2f seconds.\n\n",time4-time1); + time4=MPI_Wtime(); + fprintf(FP," Total real time of program: %4.2f seconds.\n\n",time4-time1); fprintf(FP," ******************************************************\n"); fprintf(FP," **************** SOFI3D has finished *****************\n"); fprintf(FP," ******************************************************\n\n"); -- GitLab