Changeset 1183

Timestamp:

06/30/09 11:12:59 (16 years ago)

Author:

Mathieu Morlighem

Message:

moved interp routines to trash/Eric

Location:

issm/trunk/src/m/utils/Interp

Files:

• InterpFromFile.m (modified) (3 diffs)
• griddata_grid_to_mesh.m (deleted)
• griddata_grid_to_mesh_completer.m (deleted)
• griddata_grid_to_mesh_nan.m (deleted)
• griddata_mesh_to_grid.m (deleted)
• griddata_mesh_to_mesh.m (deleted)
• griddata_mesh_to_mesh_3d.m (deleted)
• griddata_nearest.m (deleted)
• griddata_nearest_matrix.m (deleted)
• griddata_nearest_nan.m (deleted)
• griddata_nearest_vector.m (deleted)
• griddata_perso.m (deleted)

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

@@ -48 +48 @@
 
         %x -> name begins with "x" and is a vector
-        if (strcmpi(A(i).name(1),'x') & min(A(i).size)==1),
+        if (strncmpi(A(i).name,'x',1) & min(A(i).size)==1),
                 xenum=i;
 
         %y -> name begins with "y" and is a vector
-        elseif (strcmpi(A(i).name(1),'y') & min(A(i).size)==1),
+        elseif (strncmpi(A(i).name,'y',1) & min(A(i).size)==1),
                 yenum=i;
 
         %index -> name begins with "index" or "elements" and 3 columns
         elseif length(A)==4
-                if (( (length(A(i).name)>=5 & strcmpi(A(i).name(1:5),'index')) ...
-                                | (length(A(i).name)>=8 & strcmpi(A(i).name(1:8),'elements')) )...
-                                & A(i).size(2)==3),
+                if ((strncmpi(A(i).name,'index',5) | strncmpi(A(i).name,'elements',8)) & A(i).size(2)==3),
                         indexenum=i;
                 end
@@ -200 +198 @@
 
         %interpolate
-        data_out=InterpFromMesh2d(index_data,x_data,y_data,data,x,y,default_value);
+        data_out=InterpFromMesh2d(index_data,x_data(:),y_data(:),data(:),x(:),y(:),default_value);
 
 else
@@ -218 +216 @@
 
         %interpolate
-        data_out=InterpFromGrid(x_data,y_data,data,x,y,default_value);
-end
+        data_out=InterpFromGrid(x_data(:),y_data(:),data,x(:),y(:),default_value);
+end