Changeset 14939

Timestamp:

05/07/13 08:16:26 (12 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixed some segfaults due to xdelete -> delete

Location:

issm/trunk-jpl/src/c/solvers

Files:

• solver_newton.cpp (modified) (1 diff)
• solver_stokescoupling_nonlinear.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/solvers/solver_newton.cpp

@@ -61 +61 @@
                         CreateNodalConstraintsx(&ys,femmodel->nodes,configuration_type);
                         Reduceloadx(pf,Kfs,ys);delete Kfs;
-                        Solverx(&uf,Kff,pf,old_uf,df,femmodel->parameters);delete df;
+                        Solverx(&uf,Kff,pf,old_uf,df,femmodel->parameters);delete df; delete Kff; delete pf;
                         Mergesolutionfromftogx(&ug,uf,ys,femmodel->nodes,femmodel->parameters);delete ys;
-                        InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ug);delete ug;
+                        InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ug);
                         delete old_ug;old_ug=ug;
                         delete old_uf;old_uf=uf;

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

@@ -81 +81 @@
                 Reduceloadx(pf_vert, Kfs_vert, ys); delete Kfs_vert;
                 Solverx(&uf_vert, Kff_vert, pf_vert, NULL, df_vert,femmodel->parameters); delete Kff_vert; delete pf_vert; delete df_vert;
-                Mergesolutionfromftogx(&ug_vert, uf_vert,ys,femmodel->nodes,femmodel->parameters);delete uf_vert; delete ys; 
+                Mergesolutionfromftogx(&ug_vert, uf_vert,ys,femmodel->nodes,femmodel->parameters);
+                delete uf_vert; 
+                delete ys; 
                 InputUpdateFromSolutionx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,ug_vert);
-                delete ug_vert; delete uf_vert;
+                delete ug_vert;
 
                 /*Increase count: */
@@ -98 +100 @@
         delete uf_horiz;
         delete ug_horiz;
-        delete ys;
 }