Changeset 22678

Timestamp:

04/06/18 09:52:38 (7 years ago)

Author:

jdquinn

Message:

CHG: Modified JS module and header file for InterpFromGridToMesh to correctly retrieve data and mesh input lengths.

Location:

issm/trunk-jpl/src/wrappers/InterpFromGridToMesh

Files:

• InterpFromGridToMesh.h (modified) (1 diff)
• InterpFromGridToMesh.js (modified) (5 diffs)

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

@@ -55 +55 @@
 #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

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

@@ -22 +22 @@
         var dataMesh            = {};
         var dataMeshPtr         = {};
+        var     dataNumCols             = 0;
+        var     dataNumRows             = 0;
         var ddata                       = {};
         var ddataHeap           = {};
@@ -38 +40 @@
         var dyPtr                       = {};
         var interpType          = '';
+        var meshNumRows         = 0;
         var ndata                       = {};
         var nods                        = 0;
@@ -97 +100 @@
         
         nods            = xIn.length;
+        dataNumRows     = dataIn.length;
+        dataNumCols     = dataIn[0].length;
+        meshNumRows     = xMeshIn.length;
         
         
@@ -135 +141 @@
                         'number', // input      : defaultValue
                         'number', // input      : nods
+                        'number', // input      : dataNumRows
+                        'number', // input      : dataNumCols
+                        'number', // input      : meshNumRows
                         'string', // input      : interpType
                 ]
@@ -154 +163 @@
                 defaultValue, 
                 nods,
+                dataNumRows,
+                dataNumCols,
+                meshNumRows,
                 interpType
         );