source: issm/oecreview/Archive/21724-22754/ISSM-22677-22678.diff@ 22755

../trunk-jpl/src/wrappers/InterpFromGridToMesh/InterpFromGridToMesh.h

@@ -54 +54 @@
 /* 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
 

../trunk-jpl/src/wrappers/InterpFromGridToMesh/InterpFromGridToMesh.js

@@ -21 +21 @@
         var data                        = {};
         var dataMesh            = {};
         var dataMeshPtr         = {};
+        var     dataNumCols             = 0;
+        var     dataNumRows             = 0;
         var ddata                       = {};
         var ddataHeap           = {};
         var ddataPtr            = {};
@@ -37 +39 @@
         var dyMeshPtr           = {};
         var dyPtr                       = {};
         var interpType          = '';
+        var meshNumRows         = 0;
         var ndata                       = {};
         var nods                        = 0;
         var nx                          = {};
@@ -96 +99 @@
         yMesh           = dyMeshHeap.byteOffset;
         
         nods            = xIn.length;
+        dataNumRows     = dataIn.length;
+        dataNumCols     = dataIn[0].length;
+        meshNumRows     = xMeshIn.length;
         
         
         /*
@@ -134 +140 @@
                         'number', // input      : yMesh
                         'number', // input      : defaultValue
                         'number', // input      : nods
+                        'number', // input      : dataNumRows
+                        'number', // input      : dataNumCols
+                        'number', // input      : meshNumRows
                         'string', // input      : interpType
                 ]
         );
@@ -153 +162 @@
                 yMesh, 
                 defaultValue, 
                 nods,
+                dataNumRows,
+                dataNumCols,
+                meshNumRows,
                 interpType
         );
         //}}}