Changeset 2003

Timestamp:

08/27/09 09:30:55 (16 years ago)

Author:

Eric.Larour

Message:

fixed leaks

Location:

issm/trunk/src/c/parallel

Files:

• diagnostic_core.cpp (modified) (3 diffs)
• diagnostic_core_linear.cpp (modified) (1 diff)

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

@@ -119 +119 @@
                 diagnostic_core_nonlinear(&ug,NULL,NULL,fem_dh->loads,fem_dh,inputs,DiagnosticAnalysisEnum(),HorizAnalysisEnum());
 
-                if(debug)_printf_("%s\n"," computing pressure according to MacAyeal...");
-                ComputePressurex( &pg,fem_dh->elements, fem_dh->nodes, fem_dh->loads,  fem_dh->materials, numberofnodes);
+                if(dim==2){
+                        if(debug)_printf_("%s\n"," computing pressure according to MacAyeal...");
+                        ComputePressurex( &pg,fem_dh->elements, fem_dh->nodes, fem_dh->loads,  fem_dh->materials, numberofnodes);
+                }
 
         }
@@ -177 +179 @@
                 
                         //decondition" pressure
-                        VecFree(&pg);
-                        xfree((void**)&dofset);dofset=dofsetgen(1,dof3,4,numberofnodes*4); VecPartition(&pg, ug, dofset, numberofnodes*1);
+                        
+                        xfree((void**)&dofset);dofset=dofsetgen(1,dof3,4,numberofnodes*4); 
+                        VecFree(&pg);VecPartition(&pg, ug, dofset, numberofnodes*1);
                         VecScale(pg,stokesreconditioning);
                 }
@@ -188 +191 @@
         result=new Result(results->Size()+1,0,1,"p_g",pg);
         results->AddObject(result);
+
         /*output if we have rifts: */
         if(numrifts){

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

@@ -64 +64 @@
         Mergesolutionfromftogx(&ug, uf,fem->Gmn,fem->ys,fem->nodesets);VecFree(&uf);
 
+        /*free ressources: */
+        xfree((void**)&solver_string);
+
         /*Assign output pointers:*/
         *pug=ug;