Changeset 14338

Timestamp:

02/11/13 13:35:10 (12 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added v4 interpolation for pKriging

File:

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

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

@@ -69 +69 @@
                 /*partition loop across threads: */
                 for(int idx=my_rank;idx<n_interp;idx+=num_procs){
-                        _pprintLine_("      interpolation progress: "<<setw(6)<<setprecision(2)<<double(idx)/double(n_interp)*100<<"%");
+                        _pprintLine_("      interpolation progress: "<<setw(6)<<setprecision(2)<<double(idx)/double(n_interp)*100.<<"%");
                         observations->InterpolationKriging(&predictions[idx],&error[idx],x_interp[idx],y_interp[idx],radius,mindata,maxdata,variogram);
                 }
@@ -83 +83 @@
 #endif
         }
+        else if(strcmp(output,"v4")==0){
+
+                /*partition loop across threads: */
+                for(int idx=my_rank;idx<n_interp;idx+=num_procs){
+                        _pprintLine_("      interpolation progress: "<<setw(6)<<setprecision(2)<<double(idx)/double(n_interp)*100.<<"%");
+                        observations->InterpolationV4(&predictions[idx],x_interp[idx],y_interp[idx],radius,mindata,maxdata);
+                }
+                _pprintLine_("      interpolation progress: "<<fixed<<setw(6)<<setprecision(2)<<100.<<"%");
+
+#ifdef _HAVE_MPI_
+                double *sumpredictions =xNew<double>(n_interp);
+                MPI_Allreduce(predictions,sumpredictions,n_interp,MPI_DOUBLE,MPI_SUM,IssmComm::GetComm());
+                xDelete<double>(predictions); predictions=sumpredictions;
+#endif
+        }
         else if(strcmp(output,"nearestneighbor")==0){
 
                 /*partition loop across threads: */
                 for(int idx=my_rank;idx<n_interp;idx+=num_procs){
-                        _pprintLine_("      interpolation progress: "<<setw(6)<<setprecision(2)<<double(idx)/double(n_interp)*100<<"%");
+                        _pprintLine_("      interpolation progress: "<<setw(6)<<setprecision(2)<<double(idx)/double(n_interp)*100.<<"%");
                         observations->InterpolationNearestNeighbor(&predictions[idx],x_interp[idx],y_interp[idx],radius);
                 }
@@ -104 +119 @@
                 /*partition loop across threads: */
                 for(int idx=my_rank;idx<n_interp;idx+=num_procs){
-                        _pprintLine_("      interpolation progress: "<<setw(6)<<setprecision(2)<<double(idx)/double(n_interp)*100<<"%");
+                        _pprintLine_("      interpolation progress: "<<setw(6)<<setprecision(2)<<double(idx)/double(n_interp)*100.<<"%");
                         observations->InterpolationIDW(&predictions[idx],x_interp[idx],y_interp[idx],radius,mindata,maxdata,power);
                 }