Changeset 12017

Timestamp:

04/16/12 19:34:38 (13 years ago)

Author:

Eric.Larour

Message:

Debugging of Python capability.

Location:

issm/trunk-jpl

Files:

• src/c/python/io/CheckNumPythonArguments.cpp (modified) (2 diffs)
• src/c/python/io/FetchPythonData.cpp (modified) (2 diffs)
• src/c/python/io/WritePythonData.cpp (modified) (2 diffs)
• src/c/python/objects/Bamg/BamgGeom.cpp (modified) (1 diff)
• src/c/python/objects/Bamg/BamgMesh.cpp (modified) (1 diff)
• src/c/python/objects/Bamg/BamgOpts.cpp (modified) (1 diff)
• src/c/python/python-binding.h (modified) (1 diff)
• src/c/toolkits/python/pythonincludes.h (modified) (1 diff)
• src/c/toolkits/toolkits.h (modified) (1 diff)
• test/NightlyRun/test101.py (modified) (1 diff)

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

@@ -9 +9 @@
 #endif
 
-
-#if defined(_HAVE_PYTHON_) && defined(_SERIAL_)
 
 #define PY_ARRAY_UNIQUE_SYMBOL PythonIOSymbol
@@ -37 +35 @@
         return 1;
 }
-
-#endif

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

@@ -16 +16 @@
 #include "../../shared/shared.h"
 
-#if defined(_HAVE_PYTHON_) && defined(_SERIAL_)
 /*FUNCTION FetchData(char** pstring,PyObject* py_unicode){{{1*/
 void FetchData(char** pstring,PyObject* py_unicode){
@@ -72 +71 @@
 }
 /*}}}*/
-#endif

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

@@ -8 +8 @@
 #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
 #endif
-
-#if defined(_HAVE_PYTHON_) && defined(_SERIAL_)
 
 #define PY_ARRAY_UNIQUE_SYMBOL PythonIOSymbol
@@ -66 +64 @@
 }
 /*}}}*/
-
-#endif

issm/trunk-jpl/src/c/python/objects/Bamg/BamgGeom.cpp

@@ +1 @@
+/*!\file BamgGeom.cpp
+ */
+
 #include <stdio.h>
-#include "../objects.h"
-#include "../../io/io.h"
-#include "../../shared/shared.h"
+#include "../../../objects/objects.h"
+#include "../../../io/io.h"
+#include "../../../shared/shared.h"
+#include "../../io/pythonio.h"
+
 
 /*Constructors/Destructors*/

issm/trunk-jpl/src/c/python/objects/Bamg/BamgMesh.cpp

@@ +1 @@
+/*!\file BamgMesh.cpp
+ */
+
 #include <stdio.h>
-#include "../objects.h"
-#include "../../io/io.h"
-#include "../../shared/shared.h"
+#include "../../../objects/objects.h"
+#include "../../../io/io.h"
+#include "../../../shared/shared.h"
+#include "../../io/pythonio.h"
+
 
 /*Constructors/Destructors*/

issm/trunk-jpl/src/c/python/objects/Bamg/BamgOpts.cpp

@@ +1 @@
+/*!\file BamgOpts.cpp
+ */
+
 #include <stdio.h>
-#include "../../shared/shared.h"
-#include "../../include/include.h"
-#include "../objects.h"
-#include "../../io/io.h"
+#include "../../../objects/objects.h"
+#include "../../../io/io.h"
+#include "../../../shared/shared.h"
+#include "../../io/pythonio.h"
+#include "../../../include/include.h"
 
 /*Constructors/Destructors*/

issm/trunk-jpl/src/c/python/python-binding.h

@@ -4 +4 @@
 #include "./io/pythonio.h"
 #include "./include/python_macros.h"
+
 #endif

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

@@ -9 +9 @@
 #include "Python.h"
 #include "arrayobject.h"
-
-
 
 #ifdef _HAVE_BOOST_

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

@@ -12 +12 @@
 #endif
 
-#if defined(_HAVE_PYTHON_) && defined(_SERIAL_)
+#ifdef _HAVE_PYTHON_
 #include "./python/pythonincludes.h"
 #endif

issm/trunk-jpl/test/NightlyRun/test101.py

@@ -1 +1 @@
 from model import *
-from TriMesh.Python import *
+from TriMesh import *
 
 #md=model()