Index: /issm/trunk/src/m/classes/public/SectionValues.m
===================================================================
--- /issm/trunk/src/m/classes/public/SectionValues.m	(revision 2295)
+++ /issm/trunk/src/m/classes/public/SectionValues.m	(revision 2296)
@@ -72,5 +72,5 @@
 
 	%Interpolation of data on specified points
-	data_interp=InterpFromMesh2d(md.elements,md.x,md.y,data,X,Y,NaN);
+	data_interp=InterpFromMeshToMesh2d(md.elements,md.x,md.y,data,X,Y,NaN);
 
 	%Compute index
@@ -83,6 +83,6 @@
 	%Get bed and surface for each 2d point, offset to make sure that it is inside the glacier system
 	offset=10^-10;
-	bed=InterpFromMesh2d(md.elements2d,md.x2d,md.y2d,project2d(md,md.bed,1),X,Y,NaN)+offset;
-	surface=InterpFromMesh2d(md.elements2d,md.x2d,md.y2d,project2d(md,md.surface,1),X,Y,NaN)-offset;
+	bed=InterpFromMeshToMesh2d(md.elements2d,md.x2d,md.y2d,project2d(md,md.bed,1),X,Y,NaN)+offset;
+	surface=InterpFromMeshToMesh2d(md.elements2d,md.x2d,md.y2d,project2d(md,md.surface,1),X,Y,NaN)-offset;
 
 	%Some useful parameters
@@ -109,5 +109,5 @@
 
 	%Interpolation of data on specified points
-	data_interp=InterpFromMesh3d(md.elements,md.x,md.y,md.z,data,X3,Y3,Z3,NaN);
+	data_interp=InterpFromMeshToMesh3d(md.elements,md.x,md.y,md.z,data,X3,Y3,Z3,NaN);
 
 	%build outputs
Index: /issm/trunk/src/m/classes/public/mesh/meshyams.m
===================================================================
--- /issm/trunk/src/m/classes/public/mesh/meshyams.m	(revision 2295)
+++ /issm/trunk/src/m/classes/public/mesh/meshyams.m	(revision 2296)
@@ -54,6 +54,6 @@
 	%interpolate velocities onto mesh
 	disp('   interpolating velocities...');
-	vx_obs=InterpFromGrid(x_m,y_m,vx,md.x,md.y,0);
-	vy_obs=InterpFromGrid(x_m,y_m,vy,md.x,md.y,0);
+	vx_obs=InterpFromGridToMesh(x_m,y_m,vx,md.x,md.y,0);
+	vy_obs=InterpFromGridToMesh(x_m,y_m,vy,md.x,md.y,0);
 	field=sqrt(vx_obs.^2+vy_obs.^2);
 
@@ -96,5 +96,5 @@
 	md.gridonwater=zeros(md.numberofgrids,1);
 end
-md.vx_obs=InterpFromGrid(x_m,y_m,vx,md.x,md.y,0);
-md.vy_obs=InterpFromGrid(x_m,y_m,vy,md.x,md.y,0);
+md.vx_obs=InterpFromGridToMesh(x_m,y_m,vx,md.x,md.y,0);
+md.vy_obs=InterpFromGridToMesh(x_m,y_m,vy,md.x,md.y,0);
 md.vel_obs=sqrt(md.vx_obs.^2+md.vy_obs.^2);
Index: /issm/trunk/src/m/classes/public/modeldefault/defaultparams.m
===================================================================
--- /issm/trunk/src/m/classes/public/modeldefault/defaultparams.m	(revision 2295)
+++ /issm/trunk/src/m/classes/public/modeldefault/defaultparams.m	(revision 2296)
@@ -101,5 +101,5 @@
 	disp('      reading geothermal flux');
 	load(heatfluxpath);
-	md.geothermalflux=InterpFromGrid(x_m,y_m,heatflux_Antarctica,md.x,md.y,80);
+	md.geothermalflux=InterpFromGridToMesh(x_m,y_m,heatflux_Antarctica,md.x,md.y,80);
 	pos=find(md.geothermalflux==0);md.geothermalflux(pos)=80;
 	md.geothermalflux=md.geothermalflux/1000; %map is given in mW/m^2, we need it in W/m^2
Index: /issm/trunk/src/m/classes/public/plugvelocities.m
===================================================================
--- /issm/trunk/src/m/classes/public/plugvelocities.m	(revision 2295)
+++ /issm/trunk/src/m/classes/public/plugvelocities.m	(revision 2296)
@@ -94,6 +94,6 @@
 
 %interpolate
-md.vx_obs=InterpFromGrid(x,y,vx,md.x,md.y,default_value);
-md.vy_obs=InterpFromGrid(x,y,vy,md.x,md.y,default_value);
+md.vx_obs=InterpFromGridToMesh(x,y,vx,md.x,md.y,default_value);
+md.vy_obs=InterpFromGridToMesh(x,y,vy,md.x,md.y,default_value);
 md.vx=md.vx_obs;
 md.vy=md.vy_obs;
Index: /issm/trunk/src/m/classes/public/plugvelocitiesraw.m
===================================================================
--- /issm/trunk/src/m/classes/public/plugvelocitiesraw.m	(revision 2295)
+++ /issm/trunk/src/m/classes/public/plugvelocitiesraw.m	(revision 2296)
@@ -94,5 +94,5 @@
 
 %interpolate
-md.vx_obs_raw=InterpFromGrid(x,y,vx,md.x,md.y,default_value);
-md.vy_obs_raw=InterpFromGrid(x,y,vy,md.x,md.y,default_value);
+md.vx_obs_raw=InterpFromGridToMesh(x,y,vx,md.x,md.y,default_value);
+md.vy_obs_raw=InterpFromGridToMesh(x,y,vy,md.x,md.y,default_value);
 md.vel_obs_raw=sqrt(md.vx_obs_raw.^2+md.vy_obs_raw.^2);
Index: /issm/trunk/src/m/utils/Interp/InterpFromFile.m
===================================================================
--- /issm/trunk/src/m/utils/Interp/InterpFromFile.m	(revision 2295)
+++ /issm/trunk/src/m/utils/Interp/InterpFromFile.m	(revision 2296)
@@ -198,5 +198,5 @@
 
 	%interpolate
-	data_out=InterpFromMesh2d(index_data,x_data(:),y_data(:),data(:),x(:),y(:),default_value);
+	data_out=InterpFromMeshToMesh2d(index_data,x_data(:),y_data(:),data(:),x(:),y(:),default_value);
 
 else
@@ -216,4 +216,4 @@
 
 	%interpolate
-	data_out=InterpFromGrid(x_data(:),y_data(:),data,x(:),y(:),default_value);
-end
+	data_out=InterpFromGridToMesh(x_data(:),y_data(:),data,x(:),y(:),default_value);
+end
Index: /issm/trunk/src/m/utils/LatLong/stereomap.m
===================================================================
--- /issm/trunk/src/m/utils/LatLong/stereomap.m	(revision 2295)
+++ /issm/trunk/src/m/utils/LatLong/stereomap.m	(revision 2296)
@@ -23,5 +23,5 @@
 %ok, we have the transformed coordinates in the current projection, go pick up the corresponding 
 %values.
-new_data_line=InterpFromGrid(x_m,y_m,data,new_x,new_y,NaN);
+new_data_line=InterpFromGridToMesh(x_m,y_m,data,new_x,new_y,NaN);
 
 new_data=zeros(M,N);