Changeset 13310

Timestamp:

09/10/12 11:49:50 (13 years ago)

Author:

jschierm

Message:

NEW: Preliminary python FetchData for BamgGeom, BamgMesh, and BamgOpts.

Location:

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

Files:

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

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

@@ -137 +137 @@
 }
 /*}}}*/
-/*FUNCTION FetchData(BamgGeom** bamggeom,PyObject* py_ref) {{{*/
-void FetchData(BamgGeom** bamggeom,PyObject* py_ref){
-         _error_("not implemented yet (good luck John!)");
-}
-/*}}}*/
-/*FUNCTION FetchData(BamgMesh** bamggeom,PyObject* py_ref) {{{*/
-void FetchData(BamgMesh** bamggeom,PyObject* py_ref){
-        _error_("not implemented yet (good luck John!)");
-}
-/*}}}*/
-/*FUNCTION FetchData(BamgOpts** bamggeom,PyObject* py_ref) {{{*/
-void FetchData(BamgOpts** bamggeom,PyObject* py_ref){
-         _error_("not implemented yet (good luck John!)");
+
+/*ISSM objects*/
+/*FUNCTION FetchData(BamgGeom** pbamggeom,PyObject* py_dict){{{*/
+void FetchData(BamgGeom** pbamggeom,PyObject* py_dict){
+
+        /*Initialize output*/
+        BamgGeom* bamggeom=new BamgGeom();
+
+        /*Fetch all fields*/
+        FetchData(&bamggeom->Vertices,&bamggeom->VerticesSize[0],&bamggeom->VerticesSize[1],PyDict_GetItemString(py_dict,"Vertices"));
+        FetchData(&bamggeom->Edges, &bamggeom->EdgesSize[0], &bamggeom->EdgesSize[1], PyDict_GetItemString(py_dict,"Edges"));
+        FetchData(&bamggeom->Corners, &bamggeom->CornersSize[0], &bamggeom->CornersSize[1], PyDict_GetItemString(py_dict,"Corners"));
+        FetchData(&bamggeom->RequiredVertices,&bamggeom->RequiredVerticesSize[0],&bamggeom->RequiredVerticesSize[1],PyDict_GetItemString(py_dict,"RequiredVertices"));
+        FetchData(&bamggeom->RequiredEdges, &bamggeom->RequiredEdgesSize[0], &bamggeom->RequiredEdgesSize[1], PyDict_GetItemString(py_dict,"RequiredEdges"));
+        FetchData(&bamggeom->CrackedEdges,&bamggeom->CrackedEdgesSize[0],&bamggeom->CrackedEdgesSize[1],PyDict_GetItemString(py_dict,"CrackedEdges"));
+        FetchData(&bamggeom->SubDomains,&bamggeom->SubDomainsSize[0],&bamggeom->SubDomainsSize[1],PyDict_GetItemString(py_dict,"SubDomains"));
+
+        /*Assign output pointers:*/
+        *pbamggeom=bamggeom;
+}
+/*}}}*/
+/*FUNCTION FetchData(BamgMesh** pbamgmesh,PyObject* py_dict){{{*/
+void FetchData(BamgMesh** pbamgmesh,PyObject* py_dict){
+
+        /*Initialize output*/
+        BamgMesh* bamgmesh=new BamgMesh();
+
+        /*Fetch all fields*/
+        FetchData(&bamgmesh->Vertices,&bamgmesh->VerticesSize[0],&bamgmesh->VerticesSize[1],PyDict_GetItemString(py_dict,"Vertices"));
+        FetchData(&bamgmesh->Edges, &bamgmesh->EdgesSize[0], &bamgmesh->EdgesSize[1], PyDict_GetItemString(py_dict,"Edges"));
+        FetchData(&bamgmesh->Triangles, &bamgmesh->TrianglesSize[0], &bamgmesh->TrianglesSize[1], PyDict_GetItemString(py_dict,"Triangles"));
+        FetchData(&bamgmesh->CrackedEdges,&bamgmesh->CrackedEdgesSize[0],&bamgmesh->CrackedEdgesSize[1],PyDict_GetItemString(py_dict,"CrackedEdges"));
+        FetchData(&bamgmesh->VerticesOnGeomEdge,&bamgmesh->VerticesOnGeomEdgeSize[0],&bamgmesh->VerticesOnGeomEdgeSize[1],PyDict_GetItemString(py_dict,"VerticesOnGeomEdge"));
+        FetchData(&bamgmesh->VerticesOnGeomVertex,&bamgmesh->VerticesOnGeomVertexSize[0],&bamgmesh->VerticesOnGeomVertexSize[1],PyDict_GetItemString(py_dict,"VerticesOnGeomVertex"));
+        FetchData(&bamgmesh->EdgesOnGeomEdge, &bamgmesh->EdgesOnGeomEdgeSize[0], &bamgmesh->EdgesOnGeomEdgeSize[1], PyDict_GetItemString(py_dict,"EdgesOnGeomEdge"));
+        FetchData(&bamgmesh->IssmSegments,&bamgmesh->IssmSegmentsSize[0],&bamgmesh->IssmSegmentsSize[1],PyDict_GetItemString(py_dict,"IssmSegments"));
+
+        /*Assign output pointers:*/
+        *pbamgmesh=bamgmesh;
+}
+/*}}}*/
+/*FUNCTION FetchData(BamgOpts** pbamgopts,PyObject* py_dict){{{*/
+void FetchData(BamgOpts** pbamgopts,PyObject* py_dict){
+
+        /*Initialize output*/
+        BamgOpts* bamgopts=new BamgOpts();
+
+        /*Fetch all fields*/
+        FetchData(&bamgopts->anisomax,PyDict_GetItemString(py_dict,"anisomax"));
+        FetchData(&bamgopts->cutoff,PyDict_GetItemString(py_dict,"cutoff"));
+        FetchData(&bamgopts->coeff,PyDict_GetItemString(py_dict,"coeff"));
+        FetchData(&bamgopts->errg,PyDict_GetItemString(py_dict,"errg"));
+        FetchData(&bamgopts->gradation,PyDict_GetItemString(py_dict,"gradation"));
+        FetchData(&bamgopts->Hessiantype,PyDict_GetItemString(py_dict,"Hessiantype"));
+        FetchData(&bamgopts->MaxCornerAngle,PyDict_GetItemString(py_dict,"MaxCornerAngle"));
+        FetchData(&bamgopts->maxnbv,PyDict_GetItemString(py_dict,"maxnbv"));
+        FetchData(&bamgopts->maxsubdiv,PyDict_GetItemString(py_dict,"maxsubdiv"));
+        FetchData(&bamgopts->Metrictype,PyDict_GetItemString(py_dict,"Metrictype"));
+        FetchData(&bamgopts->nbjacobi,PyDict_GetItemString(py_dict,"nbjacobi"));
+        FetchData(&bamgopts->nbsmooth,PyDict_GetItemString(py_dict,"nbsmooth"));
+        FetchData(&bamgopts->omega,PyDict_GetItemString(py_dict,"omega"));
+        FetchData(&bamgopts->power,PyDict_GetItemString(py_dict,"power"));
+        FetchData(&bamgopts->verbose,PyDict_GetItemString(py_dict,"verbose"));
+
+        FetchData(&bamgopts->Crack,PyDict_GetItemString(py_dict,"Crack"));
+        FetchData(&bamgopts->geometricalmetric,PyDict_GetItemString(py_dict,"geometricalmetric"));
+        FetchData(&bamgopts->KeepVertices,PyDict_GetItemString(py_dict,"KeepVertices"));
+        FetchData(&bamgopts->splitcorners,PyDict_GetItemString(py_dict,"splitcorners"));
+
+        FetchData(&bamgopts->hmin,PyDict_GetItemString(py_dict,"hmin"));
+        FetchData(&bamgopts->hmax,PyDict_GetItemString(py_dict,"hmax"));
+        FetchData(&bamgopts->hminVertices,&bamgopts->hminVerticesSize[0],&bamgopts->hminVerticesSize[1],PyDict_GetItemString(py_dict,"hminVertices"));
+        FetchData(&bamgopts->hmaxVertices,&bamgopts->hmaxVerticesSize[0],&bamgopts->hmaxVerticesSize[1],PyDict_GetItemString(py_dict,"hmaxVertices"));
+        FetchData(&bamgopts->hVertices,&bamgopts->hVerticesSize[0],&bamgopts->hVerticesSize[1],PyDict_GetItemString(py_dict,"hVertices"));
+        FetchData(&bamgopts->metric,&bamgopts->metricSize[0],&bamgopts->metricSize[1],PyDict_GetItemString(py_dict,"metric"));
+        FetchData(&bamgopts->field,&bamgopts->fieldSize[0],&bamgopts->fieldSize[1],PyDict_GetItemString(py_dict,"field"));
+        FetchData(&bamgopts->err,&bamgopts->errSize[0],&bamgopts->errSize[1],PyDict_GetItemString(py_dict,"err"));
+
+        /*Additional checks*/
+        bamgopts->Check();
+
+        /*Assign output pointers:*/
+        *pbamgopts=bamgopts;
 }
 /*}}}*/

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

@@ -31 +31 @@
 void FetchData(int* pinteger,PyObject* py_long);
 void FetchData(bool* pbool,PyObject* py_boolean);
-void FetchData(BamgGeom** bamggeom,PyObject* py_ref);
-void FetchData(BamgMesh** bamgmesh,PyObject* py_ref);
-void FetchData(BamgOpts** bamgopts,PyObject* py_ref);
+void FetchData(BamgGeom** bamggeom,PyObject* py_dict);
+void FetchData(BamgMesh** bamgmesh,PyObject* py_dict);
+void FetchData(BamgOpts** bamgopts,PyObject* py_dict);
 void FetchData(Options** poptions,int istart, int nrhs,PyObject* arguments);