Changeset 11969

Timestamp:

04/12/12 21:09:43 (13 years ago)

Author:

Eric.Larour

Message:

Working python wrapper for TriMesh module. No need for Test anymore

Location:

issm/trunk-jpl/src/mex/TriMesh

Files:

• TriMesh.cpp (modified) (5 diffs)
• TriMesh.h (modified) (2 diffs)

issm/trunk-jpl/src/mex/TriMesh/TriMesh.cpp

@@ -5 +5 @@
 #include "./TriMesh.h"
 
-WRAPPER(TriMesh, char* DOMAINOUTLINE, double AREA, bool ORDER){ 
+WRAPPER(TriMesh){
         
         /* input: */
@@ -33 +33 @@
         FetchData(&order,ORDER);
 
+
         /*Read domain outline: */
         domain=DomainOutlineRead(domainname,false);
@@ -38 +39 @@
         /*call x core: */
         TriMeshx(&index,&x,&y,&segments,&segmentmarkerlist,domain,area,order);
-
+        
+        
         /*write outputs: */
         WriteData(INDEX,index);
@@ -56 +58 @@
         /*end module: */
         MODULEEND();
+
 }
 
-void TriMeshUsage(void)
+void TriMeshUsage(void) //{{{1
 {
         printf("\n");
@@ -70 +73 @@
         printf("\n");
 }
-
-
-#ifdef _HAVE_PYTHON_
-BOOST_PYTHON_MODULE(TriMesh){
-        boost::python::numeric::array::set_module_and_type( "numpy", "ndarray");
-        def("TriMesh",TriMesh);
-}
-#endif
+//}}}

issm/trunk-jpl/src/mex/TriMesh/TriMesh.h

@@ -13 +13 @@
 #endif
 
+/*Very important definition in case we are compiling a python module!: needs to come before header files inclusion*/
+#ifdef _HAVE_PYTHON_
+#define PY_ARRAY_UNIQUE_SYMBOL PythonIOSymbol
+#endif
+
 #include "../../c/include/globals.h"
+#include "../../c/toolkits/toolkits.h"
 #include "../../c/include/include.h"
 #include "../../c/modules/modules.h"
@@ -35 +41 @@
 
 #endif
+#ifdef _HAVE_PYTHON_
+/* serial input macros: */
+#define DOMAINOUTLINE     PyTuple_GetItem(args,0)
+#define AREA        PyTuple_GetItem(args,1)
+#define ORDER     PyTuple_GetItem(args,2)
+
+/* serial output macros: */
+#define INDEX  output,0
+#define X  output,1
+#define Y   output,2
+#define SEGMENTS   output,3
+#define SEGMENTMARKERLIST output,4
+#endif
 
 /* local prototypes: */