Changeset 13269

Timestamp:

09/05/12 14:53:00 (13 years ago)

Author:

jschierm

Message:

NEW: Added python WriteData for bamg objects.

File:

• issm/trunk-jpl/src/c/python/io/WritePythonData.cpp (modified) (3 diffs)

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

@@ -19 +19 @@
 #include "../../io/io.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
+PyObject* PyArrayFromCopiedData(int dims[2],double* data);
 
 /*Primitive data types*/
@@ -50 +51 @@
 void WriteData(PyObject* py_tuple,int index,BamgGeom* bamggeom){
 
-        _error_("not implemented yes, see ../../matlab/io/WriteMatlabData.cpp");
+        PyObject* dict=NULL;
+
+        dict=PyDict_New();
+
+        PyDict_SetItemString(dict,"Vertices",PyArrayFromCopiedData(bamggeom->VerticesSize,bamggeom->Vertices));
+        PyDict_SetItemString(dict,"Edges",PyArrayFromCopiedData(bamggeom->EdgesSize,bamggeom->Edges));
+        PyDict_SetItemString(dict,"TangentAtEdges",PyArrayFromCopiedData(bamggeom->TangentAtEdgesSize,bamggeom->TangentAtEdges));
+        PyDict_SetItemString(dict,"RequiredVertices",PyArrayFromCopiedData(bamggeom->RequiredVerticesSize,bamggeom->RequiredVertices));
+        PyDict_SetItemString(dict,"RequiredEdges",PyArrayFromCopiedData(bamggeom->RequiredEdgesSize,bamggeom->RequiredEdges));
+        PyDict_SetItemString(dict,"CrackedEdges",PyArrayFromCopiedData(bamggeom->CrackedEdgesSize,bamggeom->CrackedEdges));
+        PyDict_SetItemString(dict,"SubDomains",PyArrayFromCopiedData(bamggeom->SubDomainsSize,bamggeom->SubDomains));
+
+        PyTuple_SetItem(py_tuple, index, dict);
 }
 /*}}}*/
@@ -56 +69 @@
 void WriteData(PyObject* py_tuple,int index,BamgMesh* bamgmesh){
 
-        _error_("not implemented yes, see ../../matlab/io/WriteMatlabData.cpp");
+        PyObject* dict=NULL;
+
+        dict=PyDict_New();
+
+        PyDict_SetItemString(dict,"Triangles",PyArrayFromCopiedData(bamgmesh->TrianglesSize,bamgmesh->Triangles));
+        PyDict_SetItemString(dict,"Vertices",PyArrayFromCopiedData(bamgmesh->VerticesSize,bamgmesh->Vertices));
+        PyDict_SetItemString(dict,"Edges",PyArrayFromCopiedData(bamgmesh->EdgesSize,bamgmesh->Edges));
+        PyDict_SetItemString(dict,"IssmSegments",PyArrayFromCopiedData(bamgmesh->IssmSegmentsSize,bamgmesh->IssmSegments));
+        PyDict_SetItemString(dict,"IssmEdges",PyArrayFromCopiedData(bamgmesh->IssmEdgesSize,bamgmesh->IssmEdges));
+        PyDict_SetItemString(dict,"Quadrilaterals",PyArrayFromCopiedData(bamgmesh->QuadrilateralsSize,bamgmesh->Quadrilaterals));
+        PyDict_SetItemString(dict,"VerticesOnGeomVertex",PyArrayFromCopiedData(bamgmesh->VerticesOnGeomVertexSize,bamgmesh->VerticesOnGeomVertex));
+        PyDict_SetItemString(dict,"VerticesOnGeomEdge",PyArrayFromCopiedData(bamgmesh->VerticesOnGeomEdgeSize,bamgmesh->VerticesOnGeomEdge));
+        PyDict_SetItemString(dict,"EdgesOnGeomEdge",PyArrayFromCopiedData(bamgmesh->EdgesOnGeomEdgeSize,bamgmesh->EdgesOnGeomEdge));
+        PyDict_SetItemString(dict,"SubDomains",PyArrayFromCopiedData(bamgmesh->SubDomainsSize,bamgmesh->SubDomains));
+        PyDict_SetItemString(dict,"SubDomainsFromGeom",PyArrayFromCopiedData(bamgmesh->SubDomainsFromGeomSize,bamgmesh->SubDomainsFromGeom));
+        PyDict_SetItemString(dict,"ElementConnectivity",PyArrayFromCopiedData(bamgmesh->ElementConnectivitySize,bamgmesh->ElementConnectivity));
+        PyDict_SetItemString(dict,"NodalConnectivity",PyArrayFromCopiedData(bamgmesh->NodalConnectivitySize,bamgmesh->NodalConnectivity));
+        PyDict_SetItemString(dict,"NodalElementConnectivity",PyArrayFromCopiedData(bamgmesh->NodalElementConnectivitySize,bamgmesh->NodalElementConnectivity));
+        PyDict_SetItemString(dict,"CrackedVertices",PyArrayFromCopiedData(bamgmesh->CrackedVerticesSize,bamgmesh->CrackedVertices));
+        PyDict_SetItemString(dict,"CrackedEdges",PyArrayFromCopiedData(bamgmesh->CrackedEdgesSize,bamgmesh->CrackedEdges));
+
+        PyTuple_SetItem(py_tuple, index, dict);
+}
+/*}}}*/
+/*FUNCTION PyArrayFromCopiedData(int dims[2],double* data){{{*/
+PyObject* PyArrayFromCopiedData(int dims[2],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)dims[0];
+        pydims[1]=(npy_intp)dims[1];
+        pydata=xNew<IssmDouble>(dims[0]*dims[1]);
+        memcpy(pydata,data,dims[0]*dims[1]*sizeof(double));
+        return PyArray_SimpleNewFromData(2,pydims,NPY_DOUBLE,pydata);
 }
 /*}}}*/