Changeset 20491

Timestamp:

04/10/16 20:01:01 (9 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixing lots of memory leaks

Location:

issm/trunk-jpl/src/wrappers

Files:

• ContourToMesh/ContourToMesh.cpp (modified) (1 diff)
• ContourToNodes/ContourToNodes.cpp (modified) (1 diff)
• DistanceToMaskBoundary/DistanceToMaskBoundary.cpp (modified) (1 diff)
• ElementConnectivity/ElementConnectivity.cpp (modified) (1 diff)
• EnumToString/EnumToString.cpp (modified) (1 diff)
• ExpSimplify/ExpSimplify.cpp (modified) (1 diff)
• ExpToLevelSet/ExpToLevelSet.cpp (modified) (2 diffs)
• InterpFromMeshToGrid/InterpFromMeshToGrid.cpp (modified) (1 diff)
• InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.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)
• PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.cpp (modified) (1 diff)
• StringToEnum/StringToEnum.cpp (modified) (2 diffs)
• TriMeshProcessRifts/TriMeshProcessRifts.cpp (modified) (1 diff)
• Xy2ll/Xy2ll.cpp (modified) (1 diff)

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

@@ -90 +90 @@
         xDelete<char>(interptype);
         delete contours;
-        delete in_nod;
-        delete in_elem;
+        xDelete<double>(in_nod);
+        xDelete<double>(in_elem);
         /*end module: */
         MODULEEND();

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

@@ -50 +50 @@
         xDelete<char>(contourname);
         delete contours;
+        xDelete<double>(flags);
 
         /*end module: */

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

@@ -49 +49 @@
 
         /*Free ressources: */
-        //let matlab do this.
+        xDelete<double>(x);
+        xDelete<double>(y);
+        xDelete<double>(mask);
+        xDelete<double>(distance);
 
         /*end module: */

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

@@ -38 +38 @@
 
         /*Clean up*/
+        xDelete<int>(elements);
         xDelete<int>(nodeconnectivity);
         xDelete<int>(elementconnectivity);

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

@@ -12 +12 @@
 WRAPPER(EnumToString){
 
-        char    *name    = NULL;
-        int      enum_in;
+        char *name = NULL;
+        int   enum_in;
 
         /*Boot module: */

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

@@ -216 +216 @@
         xDelete<char>(expfile);
         delete options;
+        delete oldcontours;
+        delete newcontours;
 
         /*end module: */

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

@@ -27 +27 @@
         /* required input: */
         int       nods;
-        double   *x           = NULL;
-        double   *y           = NULL;
-        char     *interptype  = NULL;
-        double *flags = NULL;
-        Contours *contours    = NULL;
+        double   *x          = NULL;
+        double   *y          = NULL;
+        char     *interptype = NULL;
+        double   *flags      = NULL;
+        Contours *contours   = NULL;
 
         /* output: */
@@ -69 +69 @@
         xDelete<double>(x);
         xDelete<double>(y);
+        xDelete<char>(interptype);
         delete contours;
-        delete distance;
+        xDelete<double>(distance);
+        xDelete<double>(flags);
         
         /*end module: */

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

@@ -72 +72 @@
 
         /*Free ressources: */
-        //let matlab do this.
+        xDelete<double>(index);
+        xDelete<double>(x);
+        xDelete<double>(y);
+        xDelete<double>(meshdata);
+        xDelete<double>(griddata);
+        xDelete<double>(x_m);
+        xDelete<double>(y_m);
 
         /*end module: */

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

@@ -108 +108 @@
         xDelete<double>(y_prime);
         xDelete<double>(z_prime);
+        delete data_prime;
 
         /*end module: */

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

@@ -91 +91 @@
 
         /*Clean-up*/
+        xDelete<double>(lat);
+        xDelete<double>(lon);
+        xDelete<double>(x);
+        xDelete<double>(y);
         delete options;
 

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

@@ -154 +154 @@
 
         /*end module: */
+        xDelete<double>(Xs);
+        xDelete<double>(Gs);
+        xDelete<double>(Js);
+        xDelete<double>(X_out);
+        xDelete<double>(G);
+        xDelete<double>(X);
         MODULEEND();
         #else

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

@@ -89 +89 @@
 
         /*Free ressources:*/
-        //don't! let matlab do it.
+        xDelete<int>(elements);
+        xDelete<int>( elements2d);
+        xDelete<int>(int_element_partitioning);
+        xDelete<int>(int_node_partitioning);
+        xDelete<double>(element_partitioning);
+        xDelete<double>(node_partitioning);
 
         /*end module: */

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

@@ -89 +89 @@
 
         /*end module: */
+        xDelete<double>(double_index);
+        xDelete<int>(index);
+        xDelete<double>(x);
+        xDelete<double>(y);
+        delete domain;
+        delete contouri;
+        xDelete<double>(segments);
         MODULEEND();
 

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

@@ -38 +38 @@
 
         /*end module: */
+        xDelete<int>(elements);
+        xDelete<int>(connectivity);
         MODULEEND();
 }

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

@@ -40 +40 @@
         /*Free ressources: */
         xDelete<double>(connectivity);
+        xDelete<double>(pool);
         xDelete<double>(flags);
 

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

@@ -12 +12 @@
 WRAPPER(StringToEnum){
 
-        char    *name    = NULL;
-        int      enum_out;
+        char *name = NULL;
+        int   enum_out;
 
         /*Boot module: */
@@ -31 +31 @@
 
         /*end module: */
+        xDelete<char>(name);
         MODULEEND();
 }

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

@@ -50 +50 @@
 
         /*end module: */
+        delete riftstruct;
+        xDelete<int>(index);
+        xDelete<double>(x);
+        xDelete<double>(y);
+        xDelete<int>(segments);
+        xDelete<int>(segmentmarkers );
         MODULEEND();
 }

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

@@ -90 +90 @@
 
         /*Clean-up*/
+        xDelete<double>(lat);
+        xDelete<double>(lon);
+        xDelete<double>(x);
+        xDelete<double>(y);
         delete options;