Changeset 20445

Timestamp:

04/07/16 10:56:51 (9 years ago)

Author:

Mathieu Morlighem

Message:

CHG: improved printing

Location:

issm/trunk-jpl/src/c/modules

Files:

• Krigingx/pKrigingx.cpp (modified) (3 diffs)
• ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp (modified) (1 diff)

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

@@ -98 +98 @@
                 /*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: "<<fixed<<setw(6)<<setprecision(4)<<double(idx)/double(n_interp)*100.<<"%  \n");
                         observations->InterpolationNearestNeighbor(&predictions[idx],x_interp[idx],y_interp[idx],radius);
                 }
@@ -111 +111 @@
                 /*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: "<<fixed<<setw(6)<<setprecision(4)<<double(idx)/double(n_interp)*100.<<"%  \n");
                         observations->Distances(&predictions[idx],&x_interp[idx],&y_interp[idx],1,radius);
                 }
@@ -126 +126 @@
                 /*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: "<<fixed<<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);
                 }

issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp

@@ -32 +32 @@
         for(int i=0;i<num_cost_functions;i++){
                 cost_function= reCast<int,IssmDouble>(iomodel->Data(InversionCostFunctionsEnum)[i]);
+                //iomodel->FetchDataToInput(elements,InversionThicknessObsEnum);
                 if(     cost_function==ThicknessAbsMisfitEnum) iomodel->FetchDataToInput(elements,InversionThicknessObsEnum);
                 else if(cost_function==SurfaceAbsMisfitEnum)   iomodel->FetchDataToInput(elements,InversionSurfaceObsEnum);