Index: /issm/trunk/src/c/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp
===================================================================
--- /issm/trunk/src/c/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp	(revision 2286)
+++ /issm/trunk/src/c/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp	(revision 2286)
@@ -0,0 +1,167 @@
+/*!\file:  InterpFromGridToMeshx.cpp
+ * \brief  "c" core code for interpolating values from a structured grid.
+ */ 
+
+#include "./InterpFromGridToMeshx.h"
+#include "../shared/shared.h"
+
+#undef __FUNCT__ 
+#define __FUNCT__ "InterpFromGridToMeshx"
+
+int findindices(int* pm,int* pn,double* x,int x_rows, double* y,int y_rows, double xgrid,double ygrid);
+
+int InterpFromGridToMeshx( Vec* pdata_mesh,double* x_in, int x_rows, double* y_in, int y_rows, double* data, int M, int N, double* x_mesh, double* y_mesh, int nods,double default_value) {
+
+
+	/*output: */
+	Vec data_mesh=NULL;
+	
+	/*Intermediary*/
+	double* x=NULL;
+	double* y=NULL;
+	int i,m,n;
+	double x_grid,y_grid;
+	double xi,eta;
+	double G1,G2,G3,G4,data_value;
+	double area_1,area_2,area_3;
+	double area;
+
+	/*Some checks on arguments: */
+	if ((M<=2) || (N<=2) || (nods<=0)){
+		throw ErrorException(__FUNCT__,"nothing to be done according to the dimensions of input matrices and vectors.");
+	}
+
+	/*Allocate output vector: */
+	data_mesh=NewVec(nods);
+
+	/*Find out what kind of coordinates (x_in,y_in) have been given is input*/
+	if(N==(x_rows-1) && M==(y_rows-1)){
+
+		/*The coordinates given in input describe the contour of each pixel. Take the center of each pixel*/
+		x=(double*)xmalloc(N*sizeof(double));
+		y=(double*)xmalloc(M*sizeof(double));
+		for (i=0;i<N;i++) x[i]=(x_in[i]+x_in[i+1])/2;
+		for (i=0;i<M;i++) y[i]=(y_in[i]+y_in[i+1])/2;
+		x_rows=x_rows-1;
+		y_rows=y_rows-1;
+	}
+	else if (M==x_rows && N==x_rows){
+
+		/*The coordinates given in input describe the center each pixel. Keep them*/
+		x=(double*)xmalloc(N*sizeof(double));
+		y=(double*)xmalloc(M*sizeof(double));
+		for (i=0;i<N;i++) x[i]=x_in[i];
+		for (i=0;i<M;i++) y[i]=y_in[i];
+	}
+	else{
+		throw ErrorException(__FUNCT__,"x and y vectors length should be 1 or 0 more than data number of rows.");
+	}
+
+	/*Linear (triangle) interpolation: */
+	for ( i=MPI_Lowerrow(nods); i<MPI_Upperrow(nods); i++) {
+
+		x_grid=*(x_mesh+i);
+		y_grid=*(y_mesh+i);
+
+		/*Find indices m and n into y and x, for which  y(m)<=y_grids<=y(m+1) and x(n)<=x_grid<=x(n+1)*/
+		if(findindices(&n,&m,x,x_rows, y,y_rows, x_grid,y_grid)){
+			
+			/*Get area*/
+			area=(x[n+1]-x[n])*(y[m+1]-y[m]);
+
+			/*is it the upper right triangle?*/
+			/*2'     3'
+			 *+-----+
+			 *1\    |
+			 *| \   |
+			 *|  \  |
+			 *|   \ |
+			 *|    \|
+			 *2----3+1' */
+			if ((x_grid-x[n])/(x[n+1]-x[n])<(y_grid-y[m])/(y[m+1]-y[m])){
+
+				/*Then find values of data at each summit*/
+				G1=*(data+m*N+n);
+				G2=*(data+(m+1)*N+n+1);
+				G3=*(data+(m+1)*N+n);
+
+				/*Get first area coordinate*/
+				area_1=((y[m+1]-y_grid)*(x[n+1]-x[n]))/area;
+				/*Get second area coordinate*/
+				area_2=((x_grid-x[n])*(y[m+1]-y[m]))/area;
+				/*Get third area coordinate = 1-area1-area2*/
+				area_3=1-area_1-area_2;
+
+				/*interpolate*/
+				data_value=area_1*G1+area_2*G2+area_3*G3;
+			}
+			else {
+
+				/*Then find values of data at each summit*/
+				G1=*(data+(m+1)*N+n+1);
+				G2=*(data+m*N+n);
+				G3=*(data+m*N+n+1);
+
+				/*Get first area coordinate*/
+				area_1=((y_grid-y[m])*(x[n+1]-x[n]))/area;
+				/*Get second area coordinate*/
+				area_2=((x[n+1]-x_grid)*(y[m+1]-y[m]))/area;
+				/*Get third area coordinate = 1-area1-area2*/
+				area_3=1-area_1-area_2;
+
+				/*interpolate*/
+				data_value=area_1*G1+area_2*G2+area_3*G3;
+			}
+
+			/*Treat NANs*/
+			if (isnan(data_value)){
+				data_value=default_value;
+			}
+		}
+		else{
+			data_value=default_value;
+		}
+		VecSetValue(data_mesh,i,data_value,INSERT_VALUES);
+	}
+
+	/*Assign output pointers:*/
+	*pdata_mesh=data_mesh;
+}
+
+int findindices(int* pm,int* pn,double* x,int x_rows, double* y,int y_rows, double xgrid,double ygrid){
+
+	int foundx=0;
+	int foundy=0;
+	int i;
+	int m=-1;
+	int n=-1;
+
+	for (i=0;i<x_rows-1;i++){
+		if ( (*(x+i)<=xgrid) && (xgrid<*(x+i+1)) ){
+			m=i;
+			foundx= 1;
+			break;
+		}
+	}
+	if(*(x+x_rows-1)==xgrid){
+		m=x_rows-2;
+		foundx=1;
+	}
+	
+	for (i=0;i<y_rows-1;i++){
+		if ( (*(y+i)<=ygrid) && (ygrid<*(y+i+1)) ){
+			n=i;
+			foundy= 1;
+			break;
+		}
+	}
+	if(*(y+y_rows-1)==ygrid){
+		m=y_rows-2;
+		foundy=1;
+	}
+
+	/*Assign output pointers:*/
+	*pm=m;
+	*pn=n;
+	return foundx*foundy;
+}
Index: /issm/trunk/src/c/InterpFromGridToMeshx/InterpFromGridToMeshx.h
===================================================================
--- /issm/trunk/src/c/InterpFromGridToMeshx/InterpFromGridToMeshx.h	(revision 2286)
+++ /issm/trunk/src/c/InterpFromGridToMeshx/InterpFromGridToMeshx.h	(revision 2286)
@@ -0,0 +1,13 @@
+/*!\file InterpFromGridToMeshx.h
+ * \brief: header file for Data interpolation routines.
+ */
+
+#ifndef _INTERPFROMGRIDTOMESHX_H
+#define _INTERPFROMGRIDTOMESHX_H
+
+#include "../toolkits/toolkits.h"
+
+int InterpFromGridToMeshx( Vec* pdata_mesh,double* x, int x_rows, double* y, int y_rows, double* data, int M, int N, double* x_mesh, double* y_mesh, int nods, double default_value);
+
+#endif /* _INTERPFROMGRIDTOMESHX_H */
+
Index: sm/trunk/src/c/InterpFromGridToMeshx/InterpFromGridx.cpp
===================================================================
--- /issm/trunk/src/c/InterpFromGridToMeshx/InterpFromGridx.cpp	(revision 2285)
+++ 	(revision )
@@ -1,167 +1,0 @@
-/*!\file:  InterpFromGridx.cpp
- * \brief  "c" core code for interpolating values from a structured grid.
- */ 
-
-#include "./InterpFromGridx.h"
-#include "../shared/shared.h"
-
-#undef __FUNCT__ 
-#define __FUNCT__ "InterpFromGridx"
-
-int findindices(int* pm,int* pn,double* x,int x_rows, double* y,int y_rows, double xgrid,double ygrid);
-
-int InterpFromGridx( Vec* pdata_mesh,double* x_in, int x_rows, double* y_in, int y_rows, double* data, int M, int N, double* x_mesh, double* y_mesh, int nods,double default_value) {
-
-
-	/*output: */
-	Vec data_mesh=NULL;
-	
-	/*Intermediary*/
-	double* x=NULL;
-	double* y=NULL;
-	int i,m,n;
-	double x_grid,y_grid;
-	double xi,eta;
-	double G1,G2,G3,G4,data_value;
-	double area_1,area_2,area_3;
-	double area;
-
-	/*Some checks on arguments: */
-	if ((M<=2) || (N<=2) || (nods<=0)){
-		throw ErrorException(__FUNCT__,"nothing to be done according to the dimensions of input matrices and vectors.");
-	}
-
-	/*Allocate output vector: */
-	data_mesh=NewVec(nods);
-
-	/*Find out what kind of coordinates (x_in,y_in) have been given is input*/
-	if(N==(x_rows-1) && M==(y_rows-1)){
-
-		/*The coordinates given in input describe the contour of each pixel. Take the center of each pixel*/
-		x=(double*)xmalloc(N*sizeof(double));
-		y=(double*)xmalloc(M*sizeof(double));
-		for (i=0;i<N;i++) x[i]=(x_in[i]+x_in[i+1])/2;
-		for (i=0;i<M;i++) y[i]=(y_in[i]+y_in[i+1])/2;
-		x_rows=x_rows-1;
-		y_rows=y_rows-1;
-	}
-	else if (M==x_rows && N==x_rows){
-
-		/*The coordinates given in input describe the center each pixel. Keep them*/
-		x=(double*)xmalloc(N*sizeof(double));
-		y=(double*)xmalloc(M*sizeof(double));
-		for (i=0;i<N;i++) x[i]=x_in[i];
-		for (i=0;i<M;i++) y[i]=y_in[i];
-	}
-	else{
-		throw ErrorException(__FUNCT__,"x and y vectors length should be 1 or 0 more than data number of rows.");
-	}
-
-	/*Linear (triangle) interpolation: */
-	for ( i=MPI_Lowerrow(nods); i<MPI_Upperrow(nods); i++) {
-
-		x_grid=*(x_mesh+i);
-		y_grid=*(y_mesh+i);
-
-		/*Find indices m and n into y and x, for which  y(m)<=y_grids<=y(m+1) and x(n)<=x_grid<=x(n+1)*/
-		if(findindices(&n,&m,x,x_rows, y,y_rows, x_grid,y_grid)){
-			
-			/*Get area*/
-			area=(x[n+1]-x[n])*(y[m+1]-y[m]);
-
-			/*is it the upper right triangle?*/
-			/*2'     3'
-			 *+-----+
-			 *1\    |
-			 *| \   |
-			 *|  \  |
-			 *|   \ |
-			 *|    \|
-			 *2----3+1' */
-			if ((x_grid-x[n])/(x[n+1]-x[n])<(y_grid-y[m])/(y[m+1]-y[m])){
-
-				/*Then find values of data at each summit*/
-				G1=*(data+m*N+n);
-				G2=*(data+(m+1)*N+n+1);
-				G3=*(data+(m+1)*N+n);
-
-				/*Get first area coordinate*/
-				area_1=((y[m+1]-y_grid)*(x[n+1]-x[n]))/area;
-				/*Get second area coordinate*/
-				area_2=((x_grid-x[n])*(y[m+1]-y[m]))/area;
-				/*Get third area coordinate = 1-area1-area2*/
-				area_3=1-area_1-area_2;
-
-				/*interpolate*/
-				data_value=area_1*G1+area_2*G2+area_3*G3;
-			}
-			else {
-
-				/*Then find values of data at each summit*/
-				G1=*(data+(m+1)*N+n+1);
-				G2=*(data+m*N+n);
-				G3=*(data+m*N+n+1);
-
-				/*Get first area coordinate*/
-				area_1=((y_grid-y[m])*(x[n+1]-x[n]))/area;
-				/*Get second area coordinate*/
-				area_2=((x[n+1]-x_grid)*(y[m+1]-y[m]))/area;
-				/*Get third area coordinate = 1-area1-area2*/
-				area_3=1-area_1-area_2;
-
-				/*interpolate*/
-				data_value=area_1*G1+area_2*G2+area_3*G3;
-			}
-
-			/*Treat NANs*/
-			if (isnan(data_value)){
-				data_value=default_value;
-			}
-		}
-		else{
-			data_value=default_value;
-		}
-		VecSetValue(data_mesh,i,data_value,INSERT_VALUES);
-	}
-
-	/*Assign output pointers:*/
-	*pdata_mesh=data_mesh;
-}
-
-int findindices(int* pm,int* pn,double* x,int x_rows, double* y,int y_rows, double xgrid,double ygrid){
-
-	int foundx=0;
-	int foundy=0;
-	int i;
-	int m=-1;
-	int n=-1;
-
-	for (i=0;i<x_rows-1;i++){
-		if ( (*(x+i)<=xgrid) && (xgrid<*(x+i+1)) ){
-			m=i;
-			foundx= 1;
-			break;
-		}
-	}
-	if(*(x+x_rows-1)==xgrid){
-		m=x_rows-2;
-		foundx=1;
-	}
-	
-	for (i=0;i<y_rows-1;i++){
-		if ( (*(y+i)<=ygrid) && (ygrid<*(y+i+1)) ){
-			n=i;
-			foundy= 1;
-			break;
-		}
-	}
-	if(*(y+y_rows-1)==ygrid){
-		m=y_rows-2;
-		foundy=1;
-	}
-
-	/*Assign output pointers:*/
-	*pm=m;
-	*pn=n;
-	return foundx*foundy;
-}
Index: sm/trunk/src/c/InterpFromGridToMeshx/InterpFromGridx.h
===================================================================
--- /issm/trunk/src/c/InterpFromGridToMeshx/InterpFromGridx.h	(revision 2285)
+++ 	(revision )
@@ -1,13 +1,0 @@
-/*!\file InterpFromGridx.h
- * \brief: header file for Data interpolation routines.
- */
-
-#ifndef _INTERPFROMGRIDX_H
-#define _INTERPFROMGRIDX_H
-
-#include "../toolkits/toolkits.h"
-
-int InterpFromGridx( Vec* pdata_mesh,double* x, int x_rows, double* y, int y_rows, double* data, int M, int N, double* x_mesh, double* y_mesh, int nods, double default_value);
-
-#endif /* _INTERPFROMGRIDX_H */
-