Changeset 8821
- Timestamp:
- 07/06/11 13:59:42 (14 years ago)
- Location:
- issm/trunk/src/c/solvers
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/solvers/solver_adjoint_linear.cpp
r8815 r8821 28 28 Solverx(&uf, Kff, pf, NULL, df, femmodel->parameters); MatFree(&Kff); VecFree(&pf); VecFree(&df); 29 29 Mergesolutionfromftogx(&ug, uf,ys,femmodel->nodes,femmodel->parameters,true); VecFree(&uf);VecFree(&ys); //true means spc0 30 InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,ug); VecFree(&ug); VecFree(&uf); 30 InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,ug); 31 VecFree(&ug); VecFree(&uf); 31 32 } -
issm/trunk/src/c/solvers/solver_linear.cpp
r8808 r8821 27 27 Solverx(&uf, Kff, pf, NULL, df, femmodel->parameters); MatFree(&Kff); VecFree(&pf); VecFree(&df); 28 28 Mergesolutionfromftogx(&ug, uf,ys,femmodel->nodes,femmodel->parameters);VecFree(&uf);VecFree(&ys); 29 InputUpdateFromSolutionx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,ug); VecFree(&ug); VecFree(&uf); 29 InputUpdateFromSolutionx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,ug); 30 VecFree(&ug); VecFree(&uf); 30 31 } -
issm/trunk/src/c/solvers/solver_nonlinear.cpp
r8815 r8821 90 90 if(conserve_loads) delete loads; 91 91 VecFree(&uf); 92 VecFree(&ug); 93 VecFree(&old_ug); 92 94 VecFree(&old_uf); 93 95 } -
issm/trunk/src/c/solvers/solver_stokescoupling_nonlinear.cpp
r8815 r8821 64 64 Mergesolutionfromftogx(&ug_horiz, uf_horiz,ys,femmodel->nodes,femmodel->parameters); VecFree(&ys); 65 65 InputUpdateFromSolutionx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,ug_horiz); 66 VecFree(&ug_horiz); VecFree(&uf_horiz); 66 67 67 68 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); 78 79 Mergesolutionfromftogx(&ug_vert, uf_vert,ys,femmodel->nodes,femmodel->parameters);VecFree(&uf_vert); VecFree(&ys); 79 InputUpdateFromSolutionx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,ug_vert); VecFree(&ug_vert); VecFree(&uf_vert); 80 InputUpdateFromSolutionx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,ug_vert); 81 VecFree(&ug_vert); VecFree(&uf_vert); 80 82 81 83 /*Increase count: */ … … 89 91 90 92 /*clean-up*/ 91 VecFree(&uf_horiz);92 93 VecFree(&old_uf_horiz); 93 94 VecFree(&ys);
Note:
See TracChangeset
for help on using the changeset viewer.