Changeset 25721

Timestamp:

10/29/20 13:57:15 (4 years ago)

Author:

Mathieu Morlighem

Message:

BUG: cleaning up memory leaks

Location:

issm/trunk-jpl/src/c

Files:

• classes/Elements/Tria.cpp (modified) (4 diffs)
• classes/FemModel.cpp (modified) (1 diff)
• cores/ProcessArguments.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

@@ -2593 +2593 @@
                 flux += rho_ice*Jdet*gauss->weight*thickness*(vx*normal[0] + vy*normal[1]);
         }
+
+        /*Cleanup and return*/
+        xDelete<IssmDouble>(xyz_list);
+        xDelete<IssmDouble>(xyz_front);
         delete gauss;
         return flux;
@@ -2720 +2724 @@
                 flux += rho_ice*Jdet*gauss->weight*thickness*(vx*normal[0] + vy*normal[1]);
         }
+
+        /*Cleanup and return*/
         delete gauss;
+        xDelete<IssmDouble>(xyz_list);
         return flux;
 }
@@ -2846 +2853 @@
         }
 
+        /*Cleanup and return*/
+        delete gauss;
+        xDelete<IssmDouble>(xyz_list);
         return flux;
 }
@@ -4321 +4331 @@
         /*Clean up and return*/
         delete gauss;
+        xDelete<IssmDouble>(xyz_list);
         return flux;
 }

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -149 +149 @@
         xDelete<char>(petscfilename);
         xDelete<char>(restartfilename);
+        xDelete<char>(modelname);
         xDelete<char>(rootpath);
 

issm/trunk-jpl/src/c/cores/ProcessArguments.cpp

@@ -18 +18 @@
         *solution_type = StringToEnumx(argv[1]);
         char* rootpatharg = argv[2];
-        char* modelname      = xNew<char>(strlen(argv[3])+1); 
+        char* modelname   = xNew<char>(strlen(argv[3])+1); 
         xMemCpy<char>(modelname,argv[3],strlen(argv[3])+1);