Changeset 11684 for issm/branches/trunk-jpl-damage/src/c/solvers/solver_adjoint_linear.cpp

Timestamp:

03/12/12 14:40:42 (13 years ago)

Author:

cborstad

Message:

merged revisions 11428:11680 from trunk-jpl into branches/trunk-jpl-damage

Location:

issm/branches/trunk-jpl-damage

Files:

• . (modified) (1 prop)
• src/c/solvers/solver_adjoint_linear.cpp (modified) (2 diffs)

issm/branches/trunk-jpl-damage/src/c/solvers/solver_adjoint_linear.cpp

@@ -13 +13 @@
 
         /*intermediary: */
-        Mat  Kff = NULL, Kfs = NULL;
-        Vec  ug  = NULL, uf  = NULL;
-        Vec  pf  = NULL;
-        Vec  df  = NULL;
-        Vec  ys  = NULL;
+        Matrix*  Kff = NULL;
+        Matrix*  Kfs = NULL;
+        Vector*  ug  = NULL;
+        Vector*  uf  = NULL;
+        Vector*  pf  = NULL;
+        Vector*  df  = NULL;
+        Vector*  ys  = NULL;
         int  configuration_type;
 
@@ -26 +28 @@
         SystemMatricesx(&Kff, &Kfs, &pf, &df, NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
         CreateNodalConstraintsx(&ys,femmodel->nodes,configuration_type);
-        Reduceloadx(pf, Kfs, ys,true); MatFree(&Kfs); //true means spc = 0
-        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
+        Reduceloadx(pf, Kfs, ys,true); xdelete(&Kfs); //true means spc = 0
+        Solverx(&uf, Kff, pf, NULL, df, femmodel->parameters); xdelete(&Kff); xdelete(&pf); xdelete(&df);
+        Mergesolutionfromftogx(&ug, uf,ys,femmodel->nodes,femmodel->parameters,true); xdelete(&uf);xdelete(&ys); //true means spc0
         InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,ug);
-        VecFree(&ug); VecFree(&uf); 
+        xdelete(&ug); xdelete(&uf);
 }