Index: /issm/trunk/src/mex/InterpFromGridToMesh/InterpFromGridToMesh.cpp
===================================================================
--- /issm/trunk/src/mex/InterpFromGridToMesh/InterpFromGridToMesh.cpp	(revision 7518)
+++ /issm/trunk/src/mex/InterpFromGridToMesh/InterpFromGridToMesh.cpp	(revision 7519)
@@ -16,5 +16,4 @@
 		output: 
 		data_mesh:  vector of mesh interpolated data.
-
 */
 	
@@ -28,18 +27,12 @@
 	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,5 +43,9 @@
 
 	/*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,5 +58,11 @@
 
 	/* 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: */
Index: /issm/trunk/src/mex/InterpFromGridToMesh/InterpFromGridToMesh.h
===================================================================
--- /issm/trunk/src/mex/InterpFromGridToMesh/InterpFromGridToMesh.h	(revision 7518)
+++ /issm/trunk/src/mex/InterpFromGridToMesh/InterpFromGridToMesh.h	(revision 7519)
@@ -27,4 +27,5 @@
 #define YMESHHANDLE prhs[4]
 #define DEFAULTHANDLE prhs[5]
+#define INTERPENUM prhs[6]
 
 /* serial output macros: */
Index: /issm/trunk/src/mex/Test/Test.cpp
===================================================================
--- /issm/trunk/src/mex/Test/Test.cpp	(revision 7518)
+++ /issm/trunk/src/mex/Test/Test.cpp	(revision 7519)
@@ -6,6 +6,4 @@
 
 void mexFunction( int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]){
-
-	MPI_Init(NULL,NULL);
 
 }