Changeset 14010

Timestamp:

11/27/12 11:15:09 (12 years ago)

Author:

jschierm

Message:

NEW: Added python WriteData method for bool arrays (and fixed int).

Location:

issm/trunk-jpl/src/wrappers/python/io

Files:

• WritePythonData.cpp (modified) (1 diff)
• pythonio.h (modified) (1 diff)

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

@@ -49 +49 @@
         PyObject* array=NULL;
 
-        dims[0]=(npy_intp)M;
-        dims[1]=(npy_intp)N;
-        array=PyArray_SimpleNewFromData(2,dims,NPY_INT64,matrix);
+        /*intermediary:*/
+        long* lmatrix=NULL;
+        int i;
+
+        /*transform into long matrix: */
+        lmatrix=xNew<long>(M*N);
+        for(i=0;i<M*N;i++)lmatrix[i]=(long)matrix[i];
+
+        dims[0]=(npy_intp)M;
+        dims[1]=(npy_intp)N;
+        array=PyArray_SimpleNewFromData(2,dims,NPY_INT64,lmatrix);
+
+        PyTuple_SetItem(tuple, index, array);
+}/*}}}*/
+/*FUNCTION WriteData(PyObject* py_tuple,int index, bool* matrix, int M, int N){{{*/
+void WriteData(PyObject* tuple, int index, bool* matrix, int M,int N){
+
+        npy_intp dims[2]={0,0};
+        PyObject* array=NULL;
+
+        dims[0]=(npy_intp)M;
+        dims[1]=(npy_intp)N;
+        array=PyArray_SimpleNewFromData(2,dims,NPY_BOOL,matrix);
 
         PyTuple_SetItem(tuple, index, array);

issm/trunk-jpl/src/wrappers/python/io/pythonio.h

@@ -19 +19 @@
 void WriteData(PyObject* py_tuple,int index, double* matrix, int M,int N);
 void WriteData(PyObject* py_tuple,int index, int* matrix, int M,int N);
+void WriteData(PyObject* py_tuple,int index, bool* matrix, int M,int N);
 void WriteData(PyObject* py_tuple,int index, int integer);
 void WriteData(PyObject* py_tuple,int index, char* string);