Changeset 12728

Timestamp:

07/24/12 16:36:11 (13 years ago)

Author:

Mathieu Morlighem

Message:

Faster interpolation module

File:

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

issm/trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp

@@ -20 +20 @@
 
         /*Intermediary*/
+        double xmin,xmax,ymin,ymax;
         bool   isdefault;
         double defaultvalue;
@@ -57 +58 @@
         Th.CreateSingleVertexToTriangleConnectivity();
 
+        /*Get domain boundaries*/
+        xmin=x_data[0]; ymin=y_data[0];
+        xmax=x_data[0]; ymax=y_data[0];
+        for(i=1;i<nods_data;i++){
+                if(x_data[i]<xmin) xmin=x_data[i];
+                if(x_data[i]>xmax) xmax=x_data[i];
+                if(y_data[i]<ymin) ymin=y_data[i];
+                if(y_data[i]>ymax) ymax=y_data[i];
+        }
+
         /*Loop over output nodes*/
         for(i=0;i<N_interp;i++){
+                //if(i%100==0) _printString_("\r      interpolation progress: "<<setw(6)<<setprecision(2)<<double(i)/double(N_interp)*100.<<"%");
+
+                if(isdefault){
+                        if(x_interp[i]<xmin || x_interp[i]>xmax || y_interp[i]<ymin || y_interp[i]>ymax){
+                                for(j=0;j<N_data;j++) data_interp[i*N_data+j]=defaultvalue;
+                                continue;
+                        }
+                }
 
                 /*Get current point coordinates*/
@@ -125 +144 @@
                 }
         }
+        //if(N_interp>=100) _printLine_("\r      interpolation progress: "<<fixed<<setw(6)<<setprecision(2)<<100.<<"%");
 
         /*clean-up and return*/