Changeset 13695

Timestamp:

10/16/12 11:06:06 (12 years ago)

Author:

jschierm

Message:

NEW: Implemented RiftStruct for Python WriteData.

Location:

issm/trunk-jpl/src/c

Files:

• matlab/io/WriteMatlabData.cpp (modified) (1 diff)
• python/io/WritePythonData.cpp (modified) (4 diffs)

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

@@ -328 +328 @@
                 SetStructureFieldi(dataref,i,"tips"             ,1                                  ,2,&riftstruct->riftstips[2*i]);
                 SetStructureFieldi(dataref,i,"penaltypairs"     ,riftstruct->riftsnumpenaltypairs[i],7,riftstruct->riftspenaltypairs[i]);
+                SetStructureFieldi(dataref,i,"fill"             ,IceEnum);
                 SetStructureFieldi(dataref,i,"friction"         ,0);
-                SetStructureFieldi(dataref,i,"fill"             ,IceEnum);
                 SetStructureFieldi(dataref,i,"fraction"         ,0.);
                 SetStructureFieldi(dataref,i,"fractionincrement",0.1);

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

@@ -20 +20 @@
 #include "../../EnumDefinitions/EnumDefinitions.h"
 PyObject* PyArrayFromCopiedData(int dims[2],double* data);
+PyObject* PyArrayFromCopiedData(int dimi,int dimj,double* data);
 
 /*Primitive data types*/
@@ -25 +26 @@
 void WriteData(PyObject* py_tuple, int index, int integer){
 
-        PyTuple_SetItem(py_tuple, index, PyInt_FromSsize_t(integer));
+        PyTuple_SetItem(py_tuple, index, PyInt_FromSsize_t((Py_ssize_t)integer));
 
 }/*}}}*/
@@ -136 +137 @@
 void WriteData(PyObject* py_tuple,int index,RiftStruct* riftstruct){
 
-        _error_("not implemented yet... good luck John!");
+//      _error_("not implemented yet... good luck John!");
+
+        int i;
+        PyObject* list=NULL;
+        PyObject** dict=NULL;
+
+        list=PyList_New((Py_ssize_t)0);
+
+        for (i=0; i<riftstruct->numrifts; i++) {
+                dict[i]=PyDict_New();
+
+                PyDict_SetItemString(dict[i],"numsegs"          ,PyInt_FromSsize_t((Py_ssize_t)riftstruct->riftsnumsegments[i]));
+                PyDict_SetItemString(dict[i],"segments"         ,PyArrayFromCopiedData(riftstruct->riftsnumsegments[i]    ,3,riftstruct->riftssegments[i]));
+                PyDict_SetItemString(dict[i],"pairs"            ,PyArrayFromCopiedData(riftstruct->riftsnumpairs[i]       ,2,riftstruct->riftspairs[i]));
+                PyDict_SetItemString(dict[i],"tips"             ,PyArrayFromCopiedData(1                                  ,2,&riftstruct->riftstips[2*i]));
+                PyDict_SetItemString(dict[i],"penaltypairs"     ,PyArrayFromCopiedData(riftstruct->riftsnumpenaltypairs[i],7,riftstruct->riftspenaltypairs[i]));
+                PyDict_SetItemString(dict[i],"fill"             ,PyInt_FromSsize_t((Py_ssize_t)IceEnum));
+                PyDict_SetItemString(dict[i],"friction"         ,PyInt_FromSsize_t((Py_ssize_t)0));
+                PyDict_SetItemString(dict[i],"fraction"         ,PyFloat_FromDouble(0.));
+                PyDict_SetItemString(dict[i],"fractionincrement",PyFloat_FromDouble(0.1));
+                PyDict_SetItemString(dict[i],"state"            ,PyArrayFromCopiedData(riftstruct->riftsnumpenaltypairs[i],1,riftstruct->state[i]));
+
+                PyList_Append(list, dict[i]);
+        }
+
+        PyTuple_SetItem(py_tuple, index, list);
 }
 /*}}}*/
@@ -157 +183 @@
 }
 /*}}}*/
+/*FUNCTION PyArrayFromCopiedData(int dimi,int dimj,double* data){{{*/
+PyObject* PyArrayFromCopiedData(int dimi,int dimj,double* data){
+
+        double* pydata;
+        npy_intp pydims[2]={0,0};
+
+        /*  note that PyArray_SimpleNewFromData does not copy the data, so that when the original
+                 object (e.g. bamggeom,bamgmesh) is deleted, the data is gone.  */
+
+        pydims[0]=(npy_intp)dimi;
+        pydims[1]=(npy_intp)dimj;
+        pydata=xNew<IssmDouble>(dimi*dimj);
+        memcpy(pydata,data,dimi*dimj*sizeof(double));
+        return PyArray_SimpleNewFromData(2,pydims,NPY_DOUBLE,pydata);
+}
+/*}}}*/