Changeset 15104 for issm/trunk-jpl/src/c/modules/Krigingx/pKrigingx.cpp

Timestamp:

05/24/13 19:11:47 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: simplifying prints

File:

• issm/trunk-jpl/src/c/modules/Krigingx/pKrigingx.cpp (modified) (5 diffs)

issm/trunk-jpl/src/c/modules/Krigingx/pKrigingx.cpp ¶

@@ -68 +68 @@
                 /*partition loop across threads: */
                 for(int idx=my_rank;idx<n_interp;idx+=num_procs){
-                        _printf0_("      interpolation progress: "<<fixed<<setw(6)<<setprecision(4)<<double(idx)/double(n_interp)*100.<<"%" << "\n");
+                        _printf0_("      interpolation progress: "<<fixed<<setw(6)<<setprecision(4)<<double(idx)/double(n_interp)*100.<<"%\n");
                         observations->InterpolationKriging(&predictions[idx],&error[idx],x_interp[idx],y_interp[idx],radius,mindata,maxdata,variogram);
                 }
-                _printf0_("      interpolation progress: "<<fixed<<setw(6)<<setprecision(4)<<100.<<"%" << "\n");
+                _printf0_("      interpolation progress: "<<fixed<<setw(6)<<setprecision(4)<<100.<<"%\n");
 
 #ifdef _HAVE_MPI_
@@ -86 +86 @@
                 /*partition loop across threads: */
                 for(int idx=my_rank;idx<n_interp;idx+=num_procs){
-                        _printf0_("      interpolation progress: "<<fixed<<setw(6)<<setprecision(4)<<double(idx)/double(n_interp)*100.<<"%" << "\n");
+                        _printf0_("      interpolation progress: "<<fixed<<setw(6)<<setprecision(4)<<double(idx)/double(n_interp)*100.<<"%\n");
                         observations->InterpolationV4(&predictions[idx],x_interp[idx],y_interp[idx],radius,mindata,maxdata);
                 }
-                _printf0_("      interpolation progress: "<<fixed<<setw(6)<<setprecision(4)<<100.<<"%" << "\n");
+                _printf0_("      interpolation progress: "<<fixed<<setw(6)<<setprecision(4)<<100.<<"%\n");
 
 #ifdef _HAVE_MPI_
@@ -101 +101 @@
                 /*partition loop across threads: */
                 for(int idx=my_rank;idx<n_interp;idx+=num_procs){
-                        _printf0_("      interpolation progress: "<<setw(6)<<setprecision(4)<<double(idx)/double(n_interp)*100.<<"%" << "\n");
+                        _printf0_("      interpolation progress: "<<setw(6)<<setprecision(4)<<double(idx)/double(n_interp)*100.<<"%\n");
                         observations->InterpolationNearestNeighbor(&predictions[idx],x_interp[idx],y_interp[idx],radius);
                 }
-                _printf0_("      interpolation progress: "<<fixed<<setw(6)<<setprecision(4)<<100.<<"%" << "\n");
+                _printf0_("      interpolation progress: "<<fixed<<setw(6)<<setprecision(4)<<100.<<"%\n");
 
 #ifdef _HAVE_MPI_
@@ -118 +118 @@
                 /*partition loop across threads: */
                 for(int idx=my_rank;idx<n_interp;idx+=num_procs){
-                        _printf0_("      interpolation progress: "<<setw(6)<<setprecision(4)<<double(idx)/double(n_interp)*100.<<"%" << "\n");
+                        _printf0_("      interpolation progress: "<<setw(6)<<setprecision(4)<<double(idx)/double(n_interp)*100.<<"%\n");
                         observations->InterpolationIDW(&predictions[idx],x_interp[idx],y_interp[idx],radius,mindata,maxdata,power);
                 }
-                _printf0_("      interpolation progress: "<<fixed<<setw(6)<<setprecision(4)<<100.<<"%" << "\n");
+                _printf0_("      interpolation progress: "<<fixed<<setw(6)<<setprecision(4)<<100.<<"%\n");
 
 #ifdef _HAVE_MPI_
@@ -142 +142 @@
 
         MPI_Barrier(MPI_COMM_WORLD); finish=MPI_Wtime( );
-        _printf_("\n   " << setw(34) << left << "Observation fitering elapsed time: " << finish_init-start_init << " seconds  \n" << "\n");
-        _printf_("   " << setw(34) << left << "Kriging prediction elapsed time: " << finish_core-start_core << " seconds  \n" << "\n");
-        _printf_("\n   " << "Total elapsed time " << int((finish-start)/3600) << " hrs " << int(int(finish-start)%3600/60) << " min " << int(finish-start)%60 << " sec\n\n" << "\n");
+        _printf_("\n   " << setw(34) << left << "Observation fitering elapsed time: " << finish_init-start_init << " seconds  \n\n");
+        _printf_("   " << setw(34) << left << "Kriging prediction elapsed time: " << finish_core-start_core << " seconds  \n\n");
+        _printf_("\n   " << "Total elapsed time " << int((finish-start)/3600) << " hrs " << int(int(finish-start)%3600/60) << " min " << int(finish-start)%60 << " sec\n\n\n");
         return 1;
 #else