Changeset 13447

Timestamp:

09/26/12 11:25:03 (12 years ago)

Author:

jschierm

Message:

FIX: For python, modules must return all arguments, so add WriteData functions for null arguments.

Location:

issm/trunk-jpl/src

Files:

• c/matlab/io/WriteMatlabData.cpp (modified) (1 diff)
• c/matlab/io/matlabio.h (modified) (1 diff)
• c/python/io/WritePythonData.cpp (modified) (3 diffs)
• modules/ContourToMesh/ContourToMesh.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/matlab/io/WriteMatlabData.cpp

@@ -112 +112 @@
 
                 *pdataref=mxCreateString(string);
+}
+/*}}}*/
+/*FUNCTION WriteData(mxArray** pdataref){{{*/
+void WriteData(mxArray** pdataref){
+
+                ;
+
 }
 /*}}}*/

issm/trunk-jpl/src/c/matlab/io/matlabio.h

@@ -26 +26 @@
 void WriteData(mxArray** pdataref,double scalar);
 void WriteData(mxArray** pdataref,char* string);
+void WriteData(mxArray** pdataref);
 void WriteData(mxArray** pdataref,BamgGeom* bamggeom);
 void WriteData(mxArray** pdataref,BamgMesh* bamgmesh);

issm/trunk-jpl/src/c/python/io/WritePythonData.cpp

@@ -45 +45 @@
 
         PyTuple_SetItem(tuple, index, array);
+}/*}}}*/
+/*FUNCTION WriteData(PyObject* py_tuple,int index){{{*/
+void WriteData(PyObject* py_tuple, int index){
+        
+        PyTuple_SetItem(py_tuple, index, Py_None);
+
 }/*}}}*/
 
@@ -128 +134 @@
 }/*}}}*/
 /*FUNCTION WriteData(PyObject* py_tuple,int index,SeqVec<double>* vector){{{*/
-void WriteData(PyObject* tuple,int index,SeqVec<double>* vector){
+void WriteData(PyObject* py_tuple,int index,SeqVec<double>* vector){
         
         int M;
@@ -140 +146 @@
         array=PyArray_SimpleNewFromData(1,&dim,NPY_DOUBLE,buffer);
         
-        PyTuple_SetItem(tuple, index, array);
+        PyTuple_SetItem(py_tuple, index, array);
 }
 /*}}}*/

issm/trunk-jpl/src/modules/ContourToMesh/ContourToMesh.cpp

@@ -73 +73 @@
         if (strcmp(interptype,"node")==0){
                 WriteData(PLHS0,in_nod);
+                WriteData(PLHS1);
         }
         else if (strcmp(interptype,"element")==0){
                 WriteData(PLHS0,in_elem);
+                WriteData(PLHS1);
         }
         else if (strcmp(interptype,"element and node")==0){