Changeset 7519

Timestamp:

02/25/11 16:56:31 (14 years ago)

Author:

Mathieu Morlighem

Message:

Fixed Test

Location:

issm/trunk/src/mex

Files:

• InterpFromGridToMesh/InterpFromGridToMesh.cpp (modified) (4 diffs)
• InterpFromGridToMesh/InterpFromGridToMesh.h (modified) (1 diff)
• Test/Test.cpp (modified) (1 diff)

issm/trunk/src/mex/InterpFromGridToMesh/InterpFromGridToMesh.cpp

@@ -16 +16 @@
                 output: 
                 data_mesh:  vector of mesh interpolated data.
-
 */
         
@@ -28 +27 @@
         double* x=NULL;
         double* y=NULL;
-
-        int     x_rows;
-        int     y_rows;
-
+        int     x_rows,y_rows;
         double* data=NULL; 
         int     data_rows,data_cols;
-
         double* x_mesh=NULL;
         double* y_mesh=NULL;
-        
-        int     x_mesh_rows;
-        int     y_mesh_rows;
-
-        double default_value;
+        int     x_mesh_rows,y_mesh_rows;
+        double  default_value;
+        int     interpolationenum;
 
         /* output: */
@@ -50 +43 @@
 
         /*checks on arguments on the matlab side: */
-        CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&InterpFromGridToMeshUsage);
+        //CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&InterpFromGridToMeshUsage);
+        if((nlhs!=NLHS) || (nrhs!=6 && nrhs!=7)){
+                InterpFromGridToMeshUsage();
+                _error_(" usage. See above");
+        }
 
         /*Input datasets: */
@@ -61 +58 @@
 
         /* Run core computations: */
-        InterpFromGridToMeshx( &data_mesh, x, x_rows,  y, y_rows, data, data_rows,data_cols, x_mesh, y_mesh, x_mesh_rows,default_value);
+        if(nrhs==7){
+                FetchData(&interpolationenum,INTERPENUM);
+                InterpFromGridToMeshx(&data_mesh, x, x_rows,  y, y_rows, data, data_rows,data_cols, x_mesh, y_mesh, x_mesh_rows,default_value,interpolationenum);
+        }
+        else{
+                InterpFromGridToMeshx(&data_mesh, x, x_rows,  y, y_rows, data, data_rows,data_cols, x_mesh, y_mesh, x_mesh_rows,default_value);
+        }
 
         /*Write data: */

issm/trunk/src/mex/InterpFromGridToMesh/InterpFromGridToMesh.h

@@ -27 +27 @@
 #define YMESHHANDLE prhs[4]
 #define DEFAULTHANDLE prhs[5]
+#define INTERPENUM prhs[6]
 
 /* serial output macros: */

issm/trunk/src/mex/Test/Test.cpp

@@ -6 +6 @@
 
 void mexFunction( int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]){
-
-        MPI_Init(NULL,NULL);
 
 }