Changeset 20877

Timestamp:

07/11/16 08:31:23 (9 years ago)

Author:

Mathieu Morlighem

Message:

BUG: added _python in WRAPPER

Location:

issm/trunk-jpl/src/wrappers

Files:

• Chaco/Chaco.cpp (modified) (1 diff)
• DistanceToMaskBoundary/DistanceToMaskBoundary.cpp (modified) (1 diff)
• ElementConnectivity/ElementConnectivity.cpp (modified) (1 diff)
• EnumToString/EnumToString.cpp (modified) (1 diff)
• Exp2Kml/Exp2Kml.cpp (modified) (1 diff)
• ExpSimplify/ExpSimplify.cpp (modified) (1 diff)
• ExpToLevelSet/ExpToLevelSet.cpp (modified) (1 diff)
• InterpFromGridToMesh/InterpFromGridToMesh.cpp (modified) (1 diff)
• InterpFromMesh2d/InterpFromMesh2d.cpp (modified) (1 diff)
• InterpFromMeshToGrid/InterpFromMeshToGrid.cpp (modified) (1 diff)
• InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.cpp (modified) (1 diff)
• InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.cpp (modified) (1 diff)
• IssmConfig/IssmConfig.cpp (modified) (1 diff)
• KMLFileRead/KMLFileRead.cpp (modified) (1 diff)
• KMLMeshWrite/KMLMeshWrite.cpp (modified) (1 diff)
• KMLOverlay/KMLOverlay.cpp (modified) (1 diff)
• Kml2Exp/Kml2Exp.cpp (modified) (1 diff)
• Kriging/Kriging.cpp (modified) (1 diff)
• Ll2xy/Ll2xy.cpp (modified) (1 diff)
• M1qn3/M1qn3.cpp (modified) (1 diff)
• MeshPartition/MeshPartition.cpp (modified) (1 diff)
• MeshProfileIntersection/MeshProfileIntersection.cpp (modified) (1 diff)
• NodeConnectivity/NodeConnectivity.cpp (modified) (1 diff)
• PointCloudFindNeighbors/PointCloudFindNeighbors.cpp (modified) (1 diff)
• PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.cpp (modified) (1 diff)
• Shp2Kml/Shp2Kml.cpp (modified) (1 diff)
• ShpRead/ShpRead.cpp (modified) (1 diff)
• StringToEnum/StringToEnum.cpp (modified) (1 diff)
• TriMesh/TriMesh.cpp (modified) (1 diff)
• TriMeshProcessRifts/TriMeshProcessRifts.cpp (modified) (1 diff)
• Xy2ll/Xy2ll.cpp (modified) (1 diff)

issm/trunk-jpl/src/wrappers/Chaco/Chaco.cpp

@@ -16 +16 @@
         _printf0_("\n");
 }/*}}}*/
-WRAPPER(Chaco){
+WRAPPER(Chaco_python){
 
         int i;

issm/trunk-jpl/src/wrappers/DistanceToMaskBoundary/DistanceToMaskBoundary.cpp

@@ -18 +18 @@
 }/*}}}*/
 
-WRAPPER(DistanceToMaskBoundary){
+WRAPPER(DistanceToMaskBoundary_python){
 
         /*input datasets: */

issm/trunk-jpl/src/wrappers/ElementConnectivity/ElementConnectivity.cpp

@@ -10 +10 @@
         _printf0_("\n");
 }/*}}}*/
-WRAPPER(ElementConnectivity){
+WRAPPER(ElementConnectivity_python){
 
         /*inputs: */

issm/trunk-jpl/src/wrappers/EnumToString/EnumToString.cpp

@@ -10 +10 @@
         _printf0_("\n");
 }/*}}}*/
-WRAPPER(EnumToString){
+WRAPPER(EnumToString_python){
 
         char *name = NULL;

issm/trunk-jpl/src/wrappers/Exp2Kml/Exp2Kml.cpp

@@ -28 +28 @@
         _printf0_("\n");
 }/*}}}*/
-WRAPPER(Exp2Kml){
+WRAPPER(Exp2Kml_python){
 
         int i,verbose=1;

issm/trunk-jpl/src/wrappers/ExpSimplify/ExpSimplify.cpp

@@ -88 +88 @@
 
 }/*}}}*/
-WRAPPER(ExpSimplify){
+WRAPPER(ExpSimplify_python){
 
         int i,verbose=1;

issm/trunk-jpl/src/wrappers/ExpToLevelSet/ExpToLevelSet.cpp

@@ -20 +20 @@
         _printf_("\n");
 }/*}}}*/
-WRAPPER(ExpToLevelSet){
+WRAPPER(ExpToLevelSet_python){
 
         /*diverse: */

issm/trunk-jpl/src/wrappers/InterpFromGridToMesh/InterpFromGridToMesh.cpp

@@ -25 +25 @@
         _printf0_("\n");
 }/*}}}*/
-WRAPPER(InterpFromGridToMesh){
+WRAPPER(InterpFromGridToMesh_python){
 
         int i,j;

issm/trunk-jpl/src/wrappers/InterpFromMesh2d/InterpFromMesh2d.cpp

@@ -20 +20 @@
         _printf0_("\n");
 }/*}}}*/
-WRAPPER(InterpFromMesh2d){
+WRAPPER(InterpFromMesh2d_python){
 
         /*input: */

issm/trunk-jpl/src/wrappers/InterpFromMeshToGrid/InterpFromMeshToGrid.cpp

@@ -20 +20 @@
         _printf0_("\n");
 }/*}}}*/
-WRAPPER(InterpFromMeshToGrid){
+WRAPPER(InterpFromMeshToGrid_python){
 
         /*input datasets: */

issm/trunk-jpl/src/wrappers/InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.cpp

@@ -28 +28 @@
         _printf0_("\n");
 }/*}}}*/
-WRAPPER(InterpFromMeshToMesh2d){
+WRAPPER(InterpFromMeshToMesh2d_python){
 
         /*Intermediaties*/

issm/trunk-jpl/src/wrappers/InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.cpp

@@ -26 +26 @@
         _printf0_("\n");
 }/*}}}*/
-WRAPPER(InterpFromMeshToMesh3d){
+WRAPPER(InterpFromMeshToMesh3d_python){
 
         /*input: */

issm/trunk-jpl/src/wrappers/IssmConfig/IssmConfig.cpp

@@ -16 +16 @@
         _printf0_("\n");
 }/*}}}*/
-WRAPPER(IssmConfig){
+WRAPPER(IssmConfig_python){
 
         /*input/output*/

issm/trunk-jpl/src/wrappers/KMLFileRead/KMLFileRead.cpp

@@ -25 +25 @@
         _printf0_("\n");
 }/*}}}*/
-WRAPPER(KMLFileRead){
+WRAPPER(KMLFileRead_python){
 
         int i,j,nnodes=0,verbose=1;

issm/trunk-jpl/src/wrappers/KMLMeshWrite/KMLMeshWrite.cpp

@@ -29 +29 @@
         _printf0_("\n");
 }/*}}}*/
-WRAPPER(KMLMeshWrite){
+WRAPPER(KMLMeshWrite_python){
 
         int i,j,nnodes=0,verbose=1;

issm/trunk-jpl/src/wrappers/KMLOverlay/KMLOverlay.cpp

@@ -25 +25 @@
         _printf0_("\n");
 }/*}}}*/
-WRAPPER(KMLOverlay){
+WRAPPER(KMLOverlay_python){
 
         int i,verbose=1;

issm/trunk-jpl/src/wrappers/Kml2Exp/Kml2Exp.cpp

@@ -27 +27 @@
         _printf0_("\n");
 }/*}}}*/
-WRAPPER(Kml2Exp){
+WRAPPER(Kml2Exp_python){
 
         int i,verbose=1;

issm/trunk-jpl/src/wrappers/Kriging/Kriging.cpp

@@ -28 +28 @@
         _printf0_("\n");
 }/*}}}*/
-WRAPPER(Kriging){
+WRAPPER(Kriging_python){
 
         /*Outputs*/

issm/trunk-jpl/src/wrappers/Ll2xy/Ll2xy.cpp

@@ -28 +28 @@
         _printf0_("\n");
 }/*}}}*/
-WRAPPER(Ll2xy){
+WRAPPER(Ll2xy_python){
 
         int i,verbose=1;

issm/trunk-jpl/src/wrappers/M1qn3/M1qn3.cpp

@@ -36 +36 @@
 }/*}}}*/
 #endif
-WRAPPER(M1qn3){
+WRAPPER(M1qn3_python){
 
 #ifdef _HAVE_M1QN3_

issm/trunk-jpl/src/wrappers/MeshPartition/MeshPartition.cpp

@@ -13 +13 @@
         _printf_("\n");
 }/*}}}*/
-WRAPPER(MeshPartition){
+WRAPPER(MeshPartition_python){
 
         /*Indexing: */

issm/trunk-jpl/src/wrappers/MeshProfileIntersection/MeshProfileIntersection.cpp

@@ -30 +30 @@
         _printf_("        mesh.\n");
 }/*}}}*/
-WRAPPER(MeshProfileIntersection){
+WRAPPER(MeshProfileIntersection_python){
 
         int i,j;

issm/trunk-jpl/src/wrappers/NodeConnectivity/NodeConnectivity.cpp

@@ -10 +10 @@
         _printf0_("\n");
 }/*}}}*/
-WRAPPER(NodeConnectivity){
+WRAPPER(NodeConnectivity_python){
 
         /*inputs: */

issm/trunk-jpl/src/wrappers/PointCloudFindNeighbors/PointCloudFindNeighbors.cpp

@@ -15 +15 @@
         _printf_("\n");
 }/*}}}*/
-WRAPPER(PointCloudFindNeighbors){
+WRAPPER(PointCloudFindNeighbors_python){
 
         int i,j;

issm/trunk-jpl/src/wrappers/PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.cpp

@@ -10 +10 @@
         _printf_("\n");
 }/*}}}*/
-WRAPPER(PropagateFlagsFromConnectivity){
+WRAPPER(PropagateFlagsFromConnectivity_python){
 
         /*input/output datasets: */

issm/trunk-jpl/src/wrappers/Shp2Kml/Shp2Kml.cpp

@@ -34 +34 @@
         _printf0_("\n");
 }/*}}}*/
-WRAPPER(Shp2Kml){
+WRAPPER(Shp2Kml_python){
 
         int i,verbose=1;

issm/trunk-jpl/src/wrappers/ShpRead/ShpRead.cpp

@@ -26 +26 @@
         _printf0_("      ShpRead('file.shp');\n");
 }/*}}}*/
-WRAPPER(ShpRead){
+WRAPPER(ShpRead_python){
 
         /*input: */

issm/trunk-jpl/src/wrappers/StringToEnum/StringToEnum.cpp

@@ -10 +10 @@
         _printf0_("\n");
 }/*}}}*/
-WRAPPER(StringToEnum){
+WRAPPER(StringToEnum_python){
 
         char *name = NULL;

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

@@ -14 +14 @@
         _printf_("\n");
 }/*}}}*/
-WRAPPER(TriMesh){
+WRAPPER(TriMesh_python){
         
         /*intermediary: */

issm/trunk-jpl/src/wrappers/TriMeshProcessRifts/TriMeshProcessRifts.cpp

@@ -11 +11 @@
         _printf_("      index2,x2,y2,segments2,segmentmarkers2,rifts2 is the resulting triangulation where rifts have been processed.\n");
 }/*}}}*/
-WRAPPER(TriMeshProcessRifts){
+WRAPPER(TriMeshProcessRifts_python){
 
         /* returned quantities: */

issm/trunk-jpl/src/wrappers/Xy2ll/Xy2ll.cpp

@@ -28 +28 @@
         _printf0_("\n");
 }/*}}}*/
-WRAPPER(Xy2ll){
+WRAPPER(Xy2ll_python){
 
         int i,verbose=1;