Changeset 11939

Timestamp:

04/05/12 14:52:14 (13 years ago)

Author:

Eric.Larour

Message:

New Python toolkit

Location:

issm/trunk-jpl/src/c/toolkits

Files:

• python/pythonincludes.h (modified) (1 diff)
• toolkits.h (modified) (2 diffs)

issm/trunk-jpl/src/c/toolkits/python/pythonincludes.h ¶

@@ -6 +6 @@
 #define _PYTHON_INCLUDES_H_
 
-#include <stdio.h>
-using namespace std; 
+using namespace std;
 
 #include <boost/python.hpp>
-#include <boost/python/module.hpp>
 #include <boost/python/def.hpp>
 #include <numpy/arrayobject.h>
+#include <boost/python/module.hpp>
 
 using namespace boost::python;
 typedef boost::python::numeric::array pyArray;
 
-
 #endif

issm/trunk-jpl/src/c/toolkits/toolkits.h ¶

@@ -12 +12 @@
 #endif
 
+#if defined(_HAVE_PYTHON_) && defined(_SERIAL_)
+#include "./python/pythonincludes.h"
+#endif
+
 #ifdef _HAVE_PETSC_
 #include "./petsc/petscincludes.h"
@@ -20 +24 @@
 #endif
 
-#if defined(_HAVE_PYTHON_) && defined(_SERIAL_)
-#include "./python/pythonincludes.h"
-#endif
 
 #include "./mpi/mpiincludes.h"