Changeset 13395 for issm/trunk/src/modules/MeshPartition/MeshPartition.h

Timestamp:

09/19/12 09:32:34 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 13393

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/modules/MeshPartition/MeshPartition.h (modified) (2 diffs)

issm/trunk

@@ +1 @@
+projects
 autom4te.cache
 aclocal.m4

@@ +1 @@
+projects
 autom4te.cache
 aclocal.m4

issm/trunk/src/modules/MeshPartition/MeshPartition.h

@@ -1 @@
-
 /*
         MeshPartition.h
 */
 
-
 #ifndef _MESHPARTITION_H
 #define _MESHPARTITION_H
 
-/* local prototypes: */
-void MeshPartitionUsage(void);
+#ifdef HAVE_CONFIG_H
+        #include <config.h>
+#else
+        #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
+#endif
+
+/*For python modules: needs to come before header files inclusion*/
+#ifdef _HAVE_PYTHON_
+#define PY_ARRAY_UNIQUE_SYMBOL PythonIOSymbol
+#endif
 
 #include "../../c/include/globals.h"
@@ -17 +23 @@
 #include "../../c/issm-binding.h"
 
-#undef CLEANUP
-#define CLEANUP MeshPartitionLocalCleanup();
-
 #undef __FUNCT__ 
 #define __FUNCT__  "MeshPartition"
 
+#ifdef _HAVE_MATLAB_MODULES_
 /* serial input macros: */
-#define MODEL (mxArray*)prhs[0]
-#define NUMAREAS (mxArray*)prhs[1]
-
+#define MODEL    prhs[0]
+#define NUMAREAS prhs[1]
 /* serial output macros: */
 #define ELEMENTPARTITIONING (mxArray**)&plhs[0]
 #define NODEPARTITIONING (mxArray**)&plhs[1]
+#endif
+
+#ifdef _HAVE_PYTHON_MODULES_
+/* serial input macros: */
+#define MODEL    PyTuple_GetItem(args,0)
+#define NUMAREAS PyTuple_GetItem(args,1)
+/* serial output macros: */
+#define ELEMENTPARTITIONING output,0
+#define NODEPARTITIONING output,1
+#endif
 
 /* serial arg counts: */

@@ +1 @@
+projects
 autom4te.cache
 aclocal.m4