CHG: Bug in Python wrapper; cleanup

Author: TidbitSoftware

src/m/modules/InterpFromGridToMesh.py

@@ -3,22 +3,20 @@
 
 
 def InterpFromGridToMesh(x, y, data, x_mesh, y_mesh, default_value):
-    """
-    INTERPFROMGRIDTOMESH - Interpolation from a grid onto a list of points
+    """InterpFromGridToMesh - Interpolation from a grid onto a list of points
 
-   Usage:
-      data_mesh = InterpFromGridToMesh(x, y, data, x_mesh, y_mesh, default_value)
+    Usage:
+        data_mesh = InterpFromGridToMesh(x, y, data, x_mesh, y_mesh, default_value)
 
-   data:        matrix holding the data to be interpolated onto the mesh
-   x, y:        coordinates of matrix data (x and y must be in increasing order)
-   x_mesh, y_mesh:    coordinates of the points onto which we interpolate
-    default_value:    vector of mesh interpolated data
+    data:           matrix holding the data to be interpolated onto the mesh
+    x, y:           coordinates of matrix data (x and y must be in increasing order)
+    x_mesh, y_mesh: coordinates of the points onto which we interpolate
+    default_value:  vector of mesh interpolated data
 
     Example:
         load('velocities.mat')
         md.inversion.vx_obs = InterpFromGridToMesh(x_n, y_m, vx, md.mesh.x, md.mesh.y, 0)
     """
-    # Call mex module
-    data_mesh = InterpFromGridToMesh_python(x, y, data, x_mesh, y_mesh, default_value)
-    # Return
-    return np.squeeze(data_mesh)
+
+    # Call Python module
+    return np.squeeze(InterpFromGridToMesh_python(x, y, data, x_mesh, y_mesh, default_value))

src/m/modules/InterpFromMeshToGrid.m

@@ -4,8 +4,8 @@
 %   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
-%   mesh onto a regular grid.
+%   This function is a wrapper to a multi-threaded mex file that interpolates a 
+%   field defined on a triangular mesh onto a regular grid.
 %
 %   index,x,y:	delaunay triangulation defining the mesh
 %   meshdata:	vertex values of data to be interpolated

src/m/modules/InterpFromMeshToGrid.py

@@ -1,20 +1,19 @@
+import numpy as np
 from InterpFromMeshToGrid_python import InterpFromMeshToGrid_python
 
-
 def InterpFromMeshToGrid(index, x, y, data, xgrid, ygrid, default_value):
-    """
-    INTERPFROMMESHTOGRID - Interpolation of a data defined on a mesh onto a grid
+    """InterpFromMeshToGrid - Interpolation of a data defined on a mesh onto a 
+    grid
 
-        This function is a multi - threaded mex file that interpolates a field defined
-        on a triangular mesh onto a regular grid
+    This function is a wrapper to a multi-threaded Python module that 
+    interpolates a field defined on a triangular mesh onto a regular grid.
 
-        index, x, y:    delaunay triangulation defining the mesh
-        meshdata:    vertex values of data to be interpolated
+    index, x, y:    delaunay triangulation defining the mesh
+    meshdata:       vertex values of data to be interpolated
 
-        xgrid, ygrid, :    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
     """
-    # Call mex module
-    grid = InterpFromMeshToGrid_python(index, x, y, data, xgrid, ygrid, default_value)
-    # Return
-    return grid
+
+    # Call Python module
+    return np.squeeze(InterpFromMeshToGrid_python(index, x, y, data, xgrid, ygrid, default_value))

src/wrappers/InterpFromMeshToGrid/InterpFromMeshToGrid.h

@@ -47,7 +47,7 @@
 #define MESHDATA     PyTuple_GetItem(args,3)
 #define XGRID        PyTuple_GetItem(args,4)
 #define YGRID        PyTuple_GetItem(args,5)
-#define DEFAULTVALUE PyTuple_GetItem(args,10)
+#define DEFAULTVALUE PyTuple_GetItem(args,6)
 /* serial output macros: */
 #define GRIDDATA output,0
 #endif