Changeset 2573

Timestamp:

10/30/09 10:25:31 (15 years ago)

Author:

ala

Message:

fixed plugvelocities with meshed data

Location:

issm/trunk/src/m

Files:

• classes/public/mesh/meshyams.m (modified) (2 diffs)
• utils/Interp/VelFindVarNames.m (modified) (1 diff)

issm/trunk/src/m/classes/public/mesh/meshyams.m

@@ -66 +66 @@
                 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 +109 @@
         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);

issm/trunk/src/m/utils/Interp/VelFindVarNames.m

@@ -66 +66 @@
 
 %find index
-if (~isgrid & insnan(indexenum)),
+if (~isgrid & isnan(indexenum)),
         for i=1:5
                 lengthi=min(A(i).size);