Changeset 13213

Timestamp:

08/31/12 10:34:20 (13 years ago)

Author:

Mathieu Morlighem

Message:

CHG: preparing mex module conversion to python

Location:

issm/trunk-jpl/src/modules

Files:

• AverageFilter/AverageFilter.h (modified) (1 diff)
• BamgConvertMesh/BamgConvertMesh.h (modified) (1 diff)
• BamgMesher/BamgMesher.h (modified) (1 diff)
• BamgTriangulate/BamgTriangulate.h (modified) (1 diff)
• Chaco/Chaco.h (modified) (1 diff)
• ContourToMesh/ContourToMesh.h (modified) (1 diff)
• ContourToNodes/ContourToNodes.h (modified) (1 diff)
• ElementConnectivity/ElementConnectivity.h (modified) (1 diff)
• EnumToString/EnumToString.h (modified) (1 diff)
• Exp2Kml/Exp2Kml.h (modified) (1 diff)
• HoleFiller/HoleFiller.h (modified) (1 diff)
• InternalFront/InternalFront.h (modified) (1 diff)
• InterpFromGridToMesh/InterpFromGridToMesh.h (modified) (1 diff)
• InterpFromMesh2d/InterpFromMesh2d.h (modified) (1 diff)
• InterpFromMeshToGrid/InterpFromMeshToGrid.h (modified) (1 diff)
• InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.h (modified) (1 diff)
• InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.h (modified) (1 diff)
• KMLFileRead/KMLFileRead.h (modified) (1 diff)
• KMLMeshWrite/KMLMeshWrite.h (modified) (1 diff)
• KMLOverlay/KMLOverlay.h (modified) (1 diff)
• Kml2Exp/Kml2Exp.h (modified) (1 diff)
• Kriging/Kriging.h (modified) (1 diff)
• Ll2xy/Ll2xy.h (modified) (1 diff)
• MeshPartition/MeshPartition.h (modified) (1 diff)
• MeshProfileIntersection/MeshProfileIntersection.h (modified) (1 diff)
• NodeConnectivity/NodeConnectivity.h (modified) (1 diff)
• PointCloudFindNeighbors/PointCloudFindNeighbors.h (modified) (1 diff)
• PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.h (modified) (1 diff)
• Scotch/Scotch.h (modified) (1 diff)
• Shp2Kml/Shp2Kml.h (modified) (1 diff)
• StringToEnum/StringToEnum.h (modified) (1 diff)
• TriMesh/TriMesh.h (modified) (1 diff)
• TriMeshProcessRifts/TriMeshProcessRifts.h (modified) (1 diff)
• TriaSearch/TriaSearch.h (modified) (1 diff)
• Xy2ll/Xy2ll.h (modified) (1 diff)

issm/trunk-jpl/src/modules/AverageFilter/AverageFilter.h

@@ -10 +10 @@
 #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
 

issm/trunk-jpl/src/modules/BamgConvertMesh/BamgConvertMesh.h

@@ -10 +10 @@
 #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
 

issm/trunk-jpl/src/modules/BamgMesher/BamgMesher.h

@@ -10 +10 @@
 #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
 

issm/trunk-jpl/src/modules/BamgTriangulate/BamgTriangulate.h

@@ -10 +10 @@
 #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
 

issm/trunk-jpl/src/modules/Chaco/Chaco.h

@@ -12 +12 @@
 #endif
 
+/*For python modules: needs to come before header files inclusion*/
+#ifdef _HAVE_PYTHON_
+#define PY_ARRAY_UNIQUE_SYMBOL PythonIOSymbol
+#endif
+
 /* local prototypes: */
 void ChacoUsage(void);
 
+/*headers*/
 #include <stdio.h>
 #include <string.h>    /*  strcasecmp  */
 #include <time.h>      /*  clock,time,difftime  */
-
 #include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"

issm/trunk-jpl/src/modules/ContourToMesh/ContourToMesh.h

@@ -12 +12 @@
 #endif
 
-/*Very important definition in case we are compiling a python module!: needs to come before header files inclusion*/
+/*For python modules: needs to come before header files inclusion*/
 #ifdef _HAVE_PYTHON_
 #define PY_ARRAY_UNIQUE_SYMBOL PythonIOSymbol

issm/trunk-jpl/src/modules/ContourToNodes/ContourToNodes.h

@@ -10 +10 @@
 #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
 

issm/trunk-jpl/src/modules/ElementConnectivity/ElementConnectivity.h

@@ -12 +12 @@
 #endif
 
-/*Very important definition in case we are compiling a python module!: needs to come before header files inclusion*/
+/*For python modules: needs to come before header files inclusion*/
 #ifdef _HAVE_PYTHON_
 #define PY_ARRAY_UNIQUE_SYMBOL PythonIOSymbol

issm/trunk-jpl/src/modules/EnumToString/EnumToString.h

@@ -12 +12 @@
 #endif
 
-/*Very important definition in case we are compiling a python module!: needs to come before header files inclusion*/
+/*For python modules: needs to come before header files inclusion*/
 #ifdef _HAVE_PYTHON_
 #define PY_ARRAY_UNIQUE_SYMBOL PythonIOSymbol

issm/trunk-jpl/src/modules/Exp2Kml/Exp2Kml.h

@@ -10 +10 @@
 #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
 

issm/trunk-jpl/src/modules/HoleFiller/HoleFiller.h

@@ -10 +10 @@
 #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
 

issm/trunk-jpl/src/modules/InternalFront/InternalFront.h

@@ -10 +10 @@
 #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
 

issm/trunk-jpl/src/modules/InterpFromGridToMesh/InterpFromGridToMesh.h

@@ -10 +10 @@
 #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
 

issm/trunk-jpl/src/modules/InterpFromMesh2d/InterpFromMesh2d.h

@@ -10 +10 @@
 #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
 

issm/trunk-jpl/src/modules/InterpFromMeshToGrid/InterpFromMeshToGrid.h

@@ -10 +10 @@
 #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
 

issm/trunk-jpl/src/modules/InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.h

@@ -12 +12 @@
 #endif
 
-/* local prototypes: */
-void InterpFromMeshToMesh2dUsage(void);
-
-/*If python: this macro needs to come before header files inclusion*/
+/*For python modules: needs to come before header files inclusion*/
 #ifdef _HAVE_PYTHON_
 #define PY_ARRAY_UNIQUE_SYMBOL PythonIOSymbol
 #endif
+
+/* local prototypes: */
+void InterpFromMeshToMesh2dUsage(void);
 
 /*Header files: */

issm/trunk-jpl/src/modules/InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.h

@@ -10 +10 @@
 #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
 

issm/trunk-jpl/src/modules/KMLFileRead/KMLFileRead.h

@@ -10 +10 @@
 #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
 

issm/trunk-jpl/src/modules/KMLMeshWrite/KMLMeshWrite.h

@@ -10 +10 @@
 #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
 

issm/trunk-jpl/src/modules/KMLOverlay/KMLOverlay.h

@@ -10 +10 @@
 #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
 

issm/trunk-jpl/src/modules/Kml2Exp/Kml2Exp.h

@@ -10 +10 @@
 #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
 

issm/trunk-jpl/src/modules/Kriging/Kriging.h

@@ -10 +10 @@
 #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
 

issm/trunk-jpl/src/modules/Ll2xy/Ll2xy.h

@@ -10 +10 @@
 #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
 

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

@@ -10 +10 @@
 #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
 

issm/trunk-jpl/src/modules/MeshProfileIntersection/MeshProfileIntersection.h

@@ -10 +10 @@
 #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
 

issm/trunk-jpl/src/modules/NodeConnectivity/NodeConnectivity.h

@@ -12 +12 @@
 #endif
 
-/*Very important definition in case we are compiling a python module!: needs to come before header files inclusion*/
+/*For python modules: needs to come before header files inclusion*/
 #ifdef _HAVE_PYTHON_
 #define PY_ARRAY_UNIQUE_SYMBOL PythonIOSymbol

issm/trunk-jpl/src/modules/PointCloudFindNeighbors/PointCloudFindNeighbors.h

@@ -10 +10 @@
 #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
 

issm/trunk-jpl/src/modules/PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.h

@@ -10 +10 @@
 #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
 

issm/trunk-jpl/src/modules/Scotch/Scotch.h

@@ -10 +10 @@
 #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
 

issm/trunk-jpl/src/modules/Shp2Kml/Shp2Kml.h

@@ -10 +10 @@
 #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
 

issm/trunk-jpl/src/modules/StringToEnum/StringToEnum.h

@@ -12 +12 @@
 #endif
 
-/*Very important definition in case we are compiling a python module!: needs to come before header files inclusion*/
+/*For python modules: needs to come before header files inclusion*/
 #ifdef _HAVE_PYTHON_
 #define PY_ARRAY_UNIQUE_SYMBOL PythonIOSymbol

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

@@ -12 +12 @@
 #endif
 
-/*Very important definition in case we are compiling a python module!: needs to come before header files inclusion*/
+/*For python modules: needs to come before header files inclusion*/
 #ifdef _HAVE_PYTHON_
 #define PY_ARRAY_UNIQUE_SYMBOL PythonIOSymbol

issm/trunk-jpl/src/modules/TriMeshProcessRifts/TriMeshProcessRifts.h

@@ -12 +12 @@
 #endif
 
+/*For python modules: needs to come before header files inclusion*/
+#ifdef _HAVE_PYTHON_
+#define PY_ARRAY_UNIQUE_SYMBOL PythonIOSymbol
+#endif
 
 #include "mex.h"

issm/trunk-jpl/src/modules/TriaSearch/TriaSearch.h

@@ -9 +9 @@
 #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
 

issm/trunk-jpl/src/modules/Xy2ll/Xy2ll.h

@@ -12 +12 @@
 #endif
 
+/*For python modules: needs to come before header files inclusion*/
+#ifdef _HAVE_PYTHON_
+#define PY_ARRAY_UNIQUE_SYMBOL PythonIOSymbol
+#endif
 
 /* local prototypes: */