Changeset 2008

Timestamp:

08/27/09 11:49:09 (16 years ago)

Author:

Mathieu Morlighem

Message:

final leaks of thermal_steady

Location:

issm/trunk/src/c/parallel

Files:

• steadystate.cpp (modified) (1 diff)
• steadystate_core.cpp (modified) (2 diffs)
• thermal_core.cpp (modified) (2 diffs)
• thermal_core_nonlinear.cpp (modified) (2 diffs)

issm/trunk/src/c/parallel/steadystate.cpp

@@ -60 +60 @@
         outputfilename=argv[3];
         lockname=argv[4];
-
-        /*Initialize model structure: */
-        model=new Model();
 
         /*Open handle to data on disk: */

issm/trunk/src/c/parallel/steadystate_core.cpp

@@ -134 +134 @@
         }
 
-        /*Free ressource*/
-        VecFree(&old_u_g);
-        VecFree(&old_t_g);
-
         /*Plug results into output dataset: */
         result=new Result(results->Size()+1,0,1,"u_g",u_g);
@@ -147 +143 @@
         result=new Result(results->Size()+1,0,1,"m_g",m_g);
         results->AddObject(result);
+
+        /*Free ressource*/
+        VecFree(&old_u_g);
+        VecFree(&old_t_g);
+        VecFree(&u_g);
+        VecFree(&p_g);
+        VecFree(&t_g);
+        VecFree(&m_g);
 }

issm/trunk/src/c/parallel/thermal_core.cpp

@@ -46 +46 @@
         int    sub_analysis_type;
         double melting_offset;
-        
-        Param* param=NULL;
 
         /*recover fem models: */
@@ -135 +133 @@
                 }
         }
+
         /*free ressource*/
         xfree((void**)&t_g);
+        xfree((void**)&m_g);
+        xfree((void**)&time);
+
 }

issm/trunk/src/c/parallel/thermal_core_nonlinear.cpp

@@ -71 +71 @@
 
                         /*Copy K_gg_nopenalty into Kgg, same for pg: */
-                        Kgg=(Mat)xmalloc(sizeof(Mat));
                         MatDuplicate(Kgg_nopenalty,MAT_COPY_VALUES,&Kgg);
-                        pg=(Vec)xmalloc(sizeof(Vec));
-                        VecDuplicate(pg_nopenalty,&pg);VecCopy(pg_nopenalty,pg);
+                        VecDuplicatePatch(&pg,pg_nopenalty);
 
                         //apply penalties each time
@@ -101 +99 @@
                 /*Solve: */
                 if(debug)_printf_("%s\n","solving");
+                VecFree(&tf);
                 Solverx(&tf, Kff, pf,tf_old, solver_string);
                 VecFree(&tf_old); VecDuplicatePatch(&tf_old,tf);
         
                 //no need for Kff and pf anymore
-                MatFree(&Kff);VecFree(&pf);
+                MatFree(&Kff);VecFree(&pf);VecFree(&tg);
 
                 if (debug) _printf_("   merging solution from f to g set\n");