Changeset 20909

Timestamp:

07/14/16 10:06:48 (9 years ago)

Author:

bdef

Message:

BUG:uniformisation of wrapper module and reverting to standard python behaviour

Location:

issm/trunk-jpl/src/m/modules

Files:

• BamgConvertMesh.py (modified) (2 diffs)
• BamgMesher.py (modified) (2 diffs)
• BamgTriangulate.py (modified) (1 diff)
• ContourToMesh.py (modified) (1 diff)
• ContourToNodes.py (modified) (1 diff)
• ElementConnectivity.py (modified) (1 diff)
• EnumToString.py (modified) (1 diff)
• InterpFromGridToMesh.py (modified) (1 diff)
• InterpFromMeshToGrid.py (modified) (1 diff)
• InterpFromMeshToMesh2d.py (modified) (1 diff)
• InterpFromMeshToMesh3d.py (modified) (1 diff)
• IssmConfig.py (modified) (1 diff)
• MeshProfileIntersection.py (modified) (1 diff)
• NodeConnectivity.py (modified) (1 diff)
• StringToEnum.py (modified) (1 diff)
• TriMesh.py (modified) (1 diff)
• TriMeshProcessRifts.py (modified) (1 diff)

issm/trunk-jpl/src/m/modules/BamgConvertMesh.py

@@ -6 +6 @@
 
         Usage:
-                [bamggeom, bamgmesh] = BamgConvertMesh(index, x, y)
+                bamggeom, bamgmesh = BamgConvertMesh(index, x, y)
                 index: index of the mesh
                 x,y: coordinates of the nodes
@@ -12 +12 @@
         
         #Call mex module
-        [bamggeom, bamgmesh] = BamgConvertMesh_python(index,x,y);
+        bamggeom, bamgmesh = BamgConvertMesh_python(index,x,y)
 
         #return
-        return [bamggeom, bamgmesh]
+        return bamggeom, bamgmesh

issm/trunk-jpl/src/m/modules/BamgMesher.py

@@ -6 +6 @@
 
         Usage:
-                [bamgmesh,bamggeom] = BamgMesher(bamgmesh,bamggeom,bamgoptions);
+                bamgmesh,bamggeom = BamgMesher(bamgmesh,bamggeom,bamgoptions);
 
         bamgmesh: input bamg mesh
@@ -14 +14 @@
         
         #Call mex module
-        [bamgmesh, bamggeom] = BamgMesher_python(bamgmesh, bamggeom, bamgoptions);
+        bamgmesh, bamggeom = BamgMesher_python(bamgmesh, bamggeom, bamgoptions)
 
         #return
-        return [bamgmesh, bamggeom]
+        return bamgmesh, bamggeom

issm/trunk-jpl/src/m/modules/BamgTriangulate.py

@@ -13 +13 @@
 
         # Call mex module
-        index = BamgTriangulate_python(x,y);
+        index = BamgTriangulate_python(x,y)
         # return
         return index

issm/trunk-jpl/src/m/modules/ContourToMesh.py

@@ -24 +24 @@
         """
         #Call mex module
-        [in_nod,in_elem] = ContourToMesh_python(index,x,y,contourname,interptype,edgevalue);
+        in_nod,in_elem = ContourToMesh_python(index,x,y,contourname,interptype,edgevalue)
 
         if interptype=='element':
-                return [in_elem,[]]
+                return in_elem
+        elif interptype=='node':
+                return in_nod
+        elif interptype=='element and node':
+                return in_nod,in_elem
         else:
-                return [in_nod,in_elem]
+                raise TypeError('interpolation type "{}" not supported yet'.format(interptype))

issm/trunk-jpl/src/m/modules/ContourToNodes.py

@@ -15 +15 @@
 
         #Call mex module
-        [flags] = ContourToNodes_python(x,y,contourname,edgevalue);
+        flags = ContourToNodes_python(x,y,contourname,edgevalue)
 
         #return

issm/trunk-jpl/src/m/modules/ElementConnectivity.py

@@ -9 +9 @@
         """
         #Call mex module
-        elementconnectivity = ElementConnectivity_python(elements,nodeconnectivity);
+        elementconnectivity = ElementConnectivity_python(elements,nodeconnectivity)
         
         #Return

issm/trunk-jpl/src/m/modules/EnumToString.py

@@ -6 +6 @@
 
                 Usage:
-                        enumstring = EnumToString(enum);
+                        enumstring = EnumToString(enum)
         """
 
         # Call mex module
-        enumstring = EnumToString_python(enum);
+        enumstring = EnumToString_python(enum)
 
         # Return

issm/trunk-jpl/src/m/modules/InterpFromGridToMesh.py

@@ -18 +18 @@
         """
         # Call mex module
-        data_mesh=InterpFromGridToMesh_python(x,y,data,x_mesh,y_mesh,default_value);
+        data_mesh=InterpFromGridToMesh_python(x,y,data,x_mesh,y_mesh,default_value)
         # Return
         return data_mesh

issm/trunk-jpl/src/m/modules/InterpFromMeshToGrid.py

@@ -15 +15 @@
         """
         # Call mex module
-        [x_m,y_m,griddata]=InterpFromMeshToGrid_python(index,x,y,data,xmin,ymax,xposting,yposting,nlines,ncols,default_value);
+        x_m,y_m,griddata=InterpFromMeshToGrid_python(index,x,y,data,xmin,ymax,xposting,yposting,nlines,ncols,default_value)
         # Return
-        return [x_m,y_m,griddate];
+        return x_m,y_m,griddate

issm/trunk-jpl/src/m/modules/InterpFromMeshToMesh2d.py

@@ -23 +23 @@
         """
         # Call mex module
-        data_interp = InterpFromMeshToMesh2d_python(*args);
+        data_interp = InterpFromMeshToMesh2d_python(*args)
         # Return
         return data_interp

issm/trunk-jpl/src/m/modules/InterpFromMeshToMesh3d.py

@@ -17 +17 @@
       md.initialization.temperature=InterpFromMeshToMesh3d(index,x,y,z,temperature,md.mesh.x,md.mesh.y,md.mesh.z,253);
         """
-# Call mex module
-data_prime = InterpFromMeshToMesh3d_python(index,x,y,z,data,x_prime,y_prime,z_prime,default_value);
-# Return
-return data_prime
+        # Call mex module
+        data_prime = InterpFromMeshToMesh3d_python(index,x,y,z,data,x_prime,y_prime,z_prime,default_value)
+        
+        # Return
+        return data_prime

issm/trunk-jpl/src/m/modules/IssmConfig.py

@@ -10 +10 @@
 
         # Call mex module
-        value = IssmConfig_python(string);
+        value = IssmConfig_python(string)
         # Return
-        return value;
+        return value
 

issm/trunk-jpl/src/m/modules/MeshProfileIntersection.py

@@ -18 +18 @@
         
         # Call mex module
-        [segments] = MeshProfileIntersection_python(index,x,y,filename);
+        segments = MeshProfileIntersection_python(index,x,y,filename)
 
         # Return

issm/trunk-jpl/src/m/modules/NodeConnectivity.py

@@ -9 +9 @@
         """
         # Call mex module
-        connectivity = NodeConnectivity_python(elements,numnodes);
+        connectivity = NodeConnectivity_python(elements,numnodes)
 
         # Return
-        return connectivity;
+        return connectivity
 

issm/trunk-jpl/src/m/modules/StringToEnum.py

@@ -10 +10 @@
         
         # Call mex module
-        enum = StringToEnum_python(string);
+        enum = StringToEnum_python(string)
         # Return
         return enum

issm/trunk-jpl/src/m/modules/TriMesh.py

@@ -16 +16 @@
         """
         # Call mex module
-        [index,x,y,segments,segmentmarkers]=TriMesh_python(domainoutlinefilename,rifts,mesh_area);
+        index,x,y,segments,segmentmarkers=TriMesh_python(domainoutlinefilename,rifts,mesh_area)
         # Return
-        return [index,x,y,segments,segmentmarkers]
+        return index,x,y,segments,segmentmarkers
 

issm/trunk-jpl/src/m/modules/TriMeshProcessRifts.py

@@ -12 +12 @@
         """
         # Call mex module
-        [index2,x2,y2,segments2,segmentmarkers2,rifts2] = TriMeshProcessRifts_python(index1,x1,y1,segments1,segmentmarkers1);
+        index2,x2,y2,segments2,segmentmarkers2,rifts2 = TriMeshProcessRifts_python(index1,x1,y1,segments1,segmentmarkers1)
         # Return
-        return [index2,x2,y2,segments2,segmentmarkers2,rifts2] 
+        return index2,x2,y2,segments2,segmentmarkers2,rifts2