Changeset 8821

Timestamp:

07/06/11 13:59:42 (14 years ago)

Author:

Mathieu Morlighem

Message:

some memory leaks (delete ug)

Location:

issm/trunk/src/c/solvers

Files:

• solver_adjoint_linear.cpp (modified) (1 diff)
• solver_linear.cpp (modified) (1 diff)
• solver_nonlinear.cpp (modified) (1 diff)
• solver_stokescoupling_nonlinear.cpp (modified) (3 diffs)

issm/trunk/src/c/solvers/solver_adjoint_linear.cpp

@@ -28 +28 @@
         Solverx(&uf, Kff, pf, NULL, df, femmodel->parameters); MatFree(&Kff); VecFree(&pf); VecFree(&df);
         Mergesolutionfromftogx(&ug, uf,ys,femmodel->nodes,femmodel->parameters,true); VecFree(&uf);VecFree(&ys); //true means spc0
-        InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,ug); VecFree(&ug); VecFree(&uf); 
+        InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,ug);
+        VecFree(&ug); VecFree(&uf); 
 }

issm/trunk/src/c/solvers/solver_linear.cpp

@@ -27 +27 @@
         Solverx(&uf, Kff, pf, NULL, df, femmodel->parameters); MatFree(&Kff); VecFree(&pf); VecFree(&df);
         Mergesolutionfromftogx(&ug, uf,ys,femmodel->nodes,femmodel->parameters);VecFree(&uf);VecFree(&ys);
-        InputUpdateFromSolutionx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,ug); VecFree(&ug); VecFree(&uf);
+        InputUpdateFromSolutionx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,ug); 
+        VecFree(&ug); VecFree(&uf);
 }

issm/trunk/src/c/solvers/solver_nonlinear.cpp

@@ -90 +90 @@
         if(conserve_loads) delete loads;
         VecFree(&uf);
+        VecFree(&ug);
+        VecFree(&old_ug);
         VecFree(&old_uf);
 }

issm/trunk/src/c/solvers/solver_stokescoupling_nonlinear.cpp

@@ -64 +64 @@
                 Mergesolutionfromftogx(&ug_horiz, uf_horiz,ys,femmodel->nodes,femmodel->parameters); VecFree(&ys);
                 InputUpdateFromSolutionx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,ug_horiz);
+                VecFree(&ug_horiz); VecFree(&uf_horiz);
 
                 convergence(&converged,Kff_horiz,pf_horiz,uf_horiz,old_uf_horiz,femmodel->parameters); MatFree(&Kff_horiz);VecFree(&pf_horiz); VecFree(&df_horiz);
@@ -77 +78 @@
                 Solverx(&uf_vert, Kff_vert, pf_vert, NULL, df_vert,femmodel->parameters); MatFree(&Kff_vert); VecFree(&pf_vert); VecFree(&df_vert);
                 Mergesolutionfromftogx(&ug_vert, uf_vert,ys,femmodel->nodes,femmodel->parameters);VecFree(&uf_vert); VecFree(&ys);
-                InputUpdateFromSolutionx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,ug_vert); VecFree(&ug_vert); VecFree(&uf_vert);
+                InputUpdateFromSolutionx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,ug_vert);
+                VecFree(&ug_vert); VecFree(&uf_vert);
 
                 /*Increase count: */
@@ -89 +91 @@
 
         /*clean-up*/
-        VecFree(&uf_horiz);
         VecFree(&old_uf_horiz);
         VecFree(&ys);