Index: /issm/trunk/src/m/classes/public/mesh/meshyams.m
===================================================================
--- /issm/trunk/src/m/classes/public/mesh/meshyams.m	(revision 2572)
+++ /issm/trunk/src/m/classes/public/mesh/meshyams.m	(revision 2573)
@@ -66,6 +66,6 @@
 		vy_obs=InterpFromGridToMesh(Vel.(Names.xname),Vel.(Names.yname),Vel.(Names.vyname),md.x,md.y,0);
 	else
-		vx_obs=InterpMeshFromToMesh2d(Vel.(Names.indexname),Vel.(Names.xname),Vel.(Names.yname),Vel.(Names.vxname),md.x,md.y,0);
-		vy_obs=InterpMeshFromToMesh2d(Vel.(Names.indexname),Vel.(Names.xname),Vel.(Names.yname),Vel.(Names.vyname),md.x,md.y,0);
+		vx_obs=InterpFromMeshToMesh2d(Vel.(Names.indexname),Vel.(Names.xname),Vel.(Names.yname),Vel.(Names.vxname),md.x,md.y,0);
+		vy_obs=InterpFromMeshToMesh2d(Vel.(Names.indexname),Vel.(Names.xname),Vel.(Names.yname),Vel.(Names.vyname),md.x,md.y,0);
 	end
 	field=sqrt(vx_obs.^2+vy_obs.^2);
@@ -109,5 +109,10 @@
 	md.gridonwater=zeros(md.numberofgrids,1);
 end
-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);
+if strcmpi(Names.interp,'grid'),
+		md.vx_obs=InterpFromGridToMesh(Vel.(Names.xname),Vel.(Names.yname),Vel.(Names.vxname),md.x,md.y,0);
+		md.vy_obs=InterpFromGridToMesh(Vel.(Names.xname),Vel.(Names.yname),Vel.(Names.vyname),md.x,md.y,0);
+	else
+		md.vx_obs=InterpFromMeshToMesh2d(Vel.(Names.indexname),Vel.(Names.xname),Vel.(Names.yname),Vel.(Names.vxname),md.x,md.y,0);
+		md.vy_obs=InterpFromMeshToMesh2d(Vel.(Names.indexname),Vel.(Names.xname),Vel.(Names.yname),Vel.(Names.vyname),md.x,md.y,0);
+	end
 md.vel_obs=sqrt(md.vx_obs.^2+md.vy_obs.^2);
Index: /issm/trunk/src/m/utils/Interp/VelFindVarNames.m
===================================================================
--- /issm/trunk/src/m/utils/Interp/VelFindVarNames.m	(revision 2572)
+++ /issm/trunk/src/m/utils/Interp/VelFindVarNames.m	(revision 2573)
@@ -66,5 +66,5 @@
 
 %find index
-if (~isgrid & insnan(indexenum)),
+if (~isgrid & isnan(indexenum)),
 	for i=1:5
 		lengthi=min(A(i).size);