Changeset 1171

Timestamp:

06/30/09 09:07:44 (16 years ago)

Author:

Mathieu Morlighem

Message:

Use mex interpolation routines

Location:

issm/trunk/src/m/classes/public

Files:

• SectionValues.m (modified) (3 diffs)
• plot/plot_section.m (modified) (1 diff)
• plot/processdata.m (modified) (1 diff)

issm/trunk/src/m/classes/public/SectionValues.m

@@ -72 +72 @@
 
         %Interpolation of data on specified points
-        data_interp=griddata_mesh_to_mesh(md.elements,md.x,md.y,data,X,Y);
+        data_interp=InterpFromMesh2d(md.elements,md.x,md.y,data,X,Y);
 
         %Compute index
@@ -83 +83 @@
         %Get bed and surface for each 2d point, offset to make sure that it is inside the glacier system
         offset=10^-10;
-        bed=griddata_mesh_to_mesh(md.elements2d,md.x2d,md.y2d,project2d(md,md.bed,1),X,Y,'node')+offset;
-        surface=griddata_mesh_to_mesh(md.elements2d,md.x2d,md.y2d,project2d(md,md.surface,1),X,Y,'node')+offset;
+        bed=InterpFromMesh2d(md.elements2d,md.x2d,md.y2d,project2d(md,md.bed,1),X,Y)+offset;
+        surface=InterpFromMesh2d(md.elements2d,md.x2d,md.y2d,project2d(md,md.surface,1),X,Y)-offset;
 
         %Some useful parameters
@@ -109 +109 @@
 
         %Interpolation of data on specified points
-        data_interp=griddata_mesh_to_mesh_3d(md.elements,md.x,md.y,md.z,data,X3,Y3,Z3);
+        data_interp=InterpFromMesh3d(md.elements,md.x,md.y,md.z,data,X3,Y3,Z3);
 
         %build outputs

issm/trunk/src/m/classes/public/plot/plot_section.m

@@ -19 +19 @@
         index1=i;
 end
-
 
 %process data and model

issm/trunk/src/m/classes/public/plot/processdata.m

@@ -11 +11 @@
         error('plotmodel error message: data provided is empty');
 end
+
+%make a column out of data
+data=data(:);
 
 %check length