Index: ../trunk-jpl/src/wrappers/InterpFromGridToMesh/InterpFromGridToMesh.h =================================================================== --- ../trunk-jpl/src/wrappers/InterpFromGridToMesh/InterpFromGridToMesh.h (revision 22677) +++ ../trunk-jpl/src/wrappers/InterpFromGridToMesh/InterpFromGridToMesh.h (revision 22678) @@ -54,14 +54,14 @@ /* serial input macros: */ #define XHANDLE xIn,nodsIn,1 #define YHANDLE yIn,nodsIn,1 -#define DATAHANDLE dataIn,nodsIn,1 -#define XMESHHANDLE xMeshIn,nodsIn,1 -#define YMESHHANDLE yMeshIn,nodsIn,1 +#define DATAHANDLE dataIn,dataNumRowsIn,dataNumColsIn +#define XMESHHANDLE xMeshIn,meshNumRowsIn,1 +#define YMESHHANDLE yMeshIn,meshNumRowsIn,1 #define DEFAULTHANDLE defaultValue #define INTERPENUM interpType /* serial output macros: */ #define DATAMESH pdataMesh -#define WRAPPER(modulename) extern "C" { int InterpFromGridToMeshModule(double** pdataMesh, double* xIn, double* yIn, double* dataIn, double* xMeshIn, double* yMeshIn, double defaultValue, int nodsIn, char* interpType) +#define WRAPPER(modulename) extern "C" { int InterpFromGridToMeshModule(double** pdataMesh, double* xIn, double* yIn, double* dataIn, double* xMeshIn, double* yMeshIn, double defaultValue, int nodsIn, int dataNumRowsIn, int dataNumColsIn, int meshNumRowsIn, char* interpType) #define nrhs 6 #endif Index: ../trunk-jpl/src/wrappers/InterpFromGridToMesh/InterpFromGridToMesh.js =================================================================== --- ../trunk-jpl/src/wrappers/InterpFromGridToMesh/InterpFromGridToMesh.js (revision 22677) +++ ../trunk-jpl/src/wrappers/InterpFromGridToMesh/InterpFromGridToMesh.js (revision 22678) @@ -21,6 +21,8 @@ var data = {}; var dataMesh = {}; var dataMeshPtr = {}; + var dataNumCols = 0; + var dataNumRows = 0; var ddata = {}; var ddataHeap = {}; var ddataPtr = {}; @@ -37,6 +39,7 @@ var dyMeshPtr = {}; var dyPtr = {}; var interpType = ''; + var meshNumRows = 0; var ndata = {}; var nods = 0; var nx = {}; @@ -96,6 +99,9 @@ yMesh = dyMeshHeap.byteOffset; nods = xIn.length; + dataNumRows = dataIn.length; + dataNumCols = dataIn[0].length; + meshNumRows = xMeshIn.length; /* @@ -134,6 +140,9 @@ 'number', // input : yMesh 'number', // input : defaultValue 'number', // input : nods + 'number', // input : dataNumRows + 'number', // input : dataNumCols + 'number', // input : meshNumRows 'string', // input : interpType ] ); @@ -153,6 +162,9 @@ yMesh, defaultValue, nods, + dataNumRows, + dataNumCols, + meshNumRows, interpType ); //}}}