Changeset 21828 for issm/trunk-jpl/src/m/modules

Timestamp:

07/20/17 04:16:12 (8 years ago)

Author:

Mathieu Morlighem

Message:

CHG: simplified the arguments of InterpFromMeshToGrid

Location:

issm/trunk-jpl/src/m/modules

Files:

• InterpFromMeshToGrid.m (modified) (3 diffs)
• InterpFromMeshToGrid.py (modified) (2 diffs)

issm/trunk-jpl/src/m/modules/InterpFromMeshToGrid.m

@@ -1 @@
-function [x_m,y_m,griddata] = InterpFromMeshToGrid(index,x,y,data,xmin,ymax,xposting,yposting,nlines,ncols,default_value);
+function grid = InterpFromMeshToGrid(index,x,y,data,xgrid,ygrid,default_value);
 %INTERPFROMMESHTOGRID - Interpolation of a data defined on a mesh onto a grid
+%
+%   Usage:
+%      grid = InterpFromMeshToGrid(index,x,y,data,xgrid,ygrid,default_value)
 %
 %   This function is a multi-threaded mex file that interpolates a field defined on a triangular
@@ -8 +11 @@
 %   meshdata:   vertex values of data to be interpolated
 %
-%   xmin,ymax,posting,nlines,ncols: parameters that define the grid
-%   default_value:      value of points located out of the mesh
+%   xgrid,ygrid:   parameters that define the grid
+%   default_value: value of points located out of the mesh
 
 % Check usage
-if nargin~=11
+if nargin~=7
         help InterpFromMeshToGrid
         error('Wrong usage (see above)');
@@ -18 +21 @@
 
 % Call mex module
-[x_m,y_m,griddata] = InterpFromMeshToGrid_matlab(index,x,y,data,xmin,ymax,xposting,yposting,nlines,ncols,default_value);
+grid = InterpFromMeshToGrid_matlab(index,x,y,data,xgrid,ygrid,default_value);

issm/trunk-jpl/src/m/modules/InterpFromMeshToGrid.py

@@ -1 +1 @@
 from InterpFromMeshToGrid_python import InterpFromMeshToGrid_python
 
-def InterpFromMeshToGrid(index,x,y,data,xmin,ymax,xposting,yposting,nlines,ncols,default_value):
+def InterpFromMeshToGrid(index,x,y,data,xgrid,ygrid,default_value):
         """
         INTERPFROMMESHTOGRID - Interpolation of a data defined on a mesh onto a grid
@@ -11 +11 @@
                 meshdata:       vertex values of data to be interpolated
 
-                xmin,ymax,posting,nlines,ncols: parameters that define the grid
+                xgrid,ygrid,:   parameters that define the grid
                 default_value:  value of points located out of the mesh
         """
         # Call mex module
-        x_m,y_m,griddata=InterpFromMeshToGrid_python(index,x,y,data,xmin,ymax,xposting,yposting,nlines,ncols,default_value)
+        grid=InterpFromMeshToGrid_python(index,x,y,data,xgrid,ygrid,default_value)
         # Return
-        return x_m,y_m,griddate
+        return grid