progress ala fdacrtmc

marchenko/demo/twoD/primaries.scr

@@ -17,7 +17,7 @@ select=301
 makewave fp=20 dt=0.004 file_out=wave.su nt=1024 t0=0.0 scale=0 scfft=1
 
 marchenko_primaries file_shot=shots/refl_rp.su ishot=$select file_src=wave.su \
-	nshots=601 verbose=2 istart=40 iend=650 fmax=90 \
+	nshots=601 verbose=1 istart=40 iend=650 fmax=90 \
 	niter=22 niterskip=50 shift=20 file_rr=pred_rr.su T=0
 
 #for reference original shot record from Reflection matrix

marchenko/marchenko_primaries.c

@@ -484,7 +484,6 @@ int main (int argc, char **argv)
         fprintf(stderr,"    %s: Progress: %3d%%",xargv[0],0);
 	}
     perc=(iend-istart)/10;if(!perc)perc=1;
-	fprintf(stderr,"perc=%d\n", perc);
 
 /*================ start loop over number of time-samples ================*/
 
@@ -630,11 +629,11 @@ int main (int argc, char **argv)
         /* To Do optional write intermediate RR results to file */
 
         if (verbose) {
-            if(!((iend-ii-istart)%perc)) fprintf(stderr,"\b\b\b\b%3d%% %d",(ii-istart)*10/(iend-istart), ii);
+            if(!((iend-ii-istart)%perc)) fprintf(stderr,"\b\b\b\b%3d%%",(ii-istart)*100/(iend-istart));
             if((ii-istart)==10)t4=wallclock_time();
             if((ii-istart)==50){
                 t4=(wallclock_time()-t4)*((iend-istart)/40.0);
-                fprintf(stderr,"\r    %s: Estimated total compute time = %.2fs.\n    %s: Progress: %3d%%",xargv[0],t4,xargv[0],(ii-istart)/((iend-istart)/10));
+                fprintf(stderr,"\r    %s: Estimated total compute time = %.2fs.\n    %s: Progress: %3d%%",xargv[0],t4,xargv[0],(ii-istart)/((iend-istart)/100));
             }
             //t4=wallclock_time();
             tii=(t4-t1)*((float)(iend-istart)/(ii-istart+1.0))-(t4-t1);