Changeset 4524
- Timestamp:
- 07/12/10 10:53:08 (15 years ago)
- Location:
- issm/trunk/src/c/solvers
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/solvers/solver_diagnostic_nonlinear.cpp
r4339 r4524 68 68 VecFree(&old_uf);old_uf=uf; 69 69 70 if (verbose)_printf_(" Generating matrices\n");70 if(verbose)_printf_(" Generating matrices\n"); 71 71 SystemMatricesx(&Kgg, &pg,femmodel->elements,femmodel->nodes,femmodel->vertices,loads,femmodel->materials,femmodel->parameters,kflag,pflag); 72 72 73 if (verbose)_printf_(" Generating penalty matrices\n");73 if(verbose)_printf_(" Generating penalty matrices\n"); 74 74 PenaltySystemMatricesx(Kgg, pg,NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,loads,femmodel->materials,femmodel->parameters,kflag,pflag); 75 75 76 if (verbose)_printf_(" reducing matrix from g to f set\n");76 if(verbose)_printf_(" reducing matrix from g to f set\n"); 77 77 Reducematrixfromgtofx(&Kff,&Kfs,Kgg,femmodel->Gmn,femmodel->nodesets); 78 78 … … 80 80 MatFree(&Kgg); 81 81 82 if (verbose)_printf_(" reducing load from g to f set\n");82 if(verbose)_printf_(" reducing load from g to f set\n"); 83 83 Reduceloadfromgtofx(&pf, pg, femmodel->Gmn, Kfs, femmodel->ys, femmodel->nodesets); 84 84 … … 87 87 MatFree(&Kfs); 88 88 89 if (verbose)_printf_(" solving\n");89 if(verbose)_printf_(" solving\n"); 90 90 Solverx(&uf, Kff, pf, old_uf, solver_string); 91 91 92 if (verbose)_printf_(" merging solution from f to g set\n");92 if(verbose)_printf_(" merging solution from f to g set\n"); 93 93 Mergesolutionfromftogx(&ug, uf,femmodel->Gmn,femmodel->ys,femmodel->nodesets); 94 94 … … 96 96 InputUpdateFromSolutionx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,ug); 97 97 98 if (verbose)_printf_(" penalty constraints\n");98 if(verbose)_printf_(" penalty constraints\n"); 99 99 PenaltyConstraintsx(&constraints_converged, &num_unstable_constraints, femmodel->elements,femmodel->nodes,femmodel->vertices,loads,femmodel->materials,femmodel->parameters); 100 100 -
issm/trunk/src/c/solvers/solver_linear.cpp
r4247 r4524 32 32 33 33 //*Generate system matrices 34 if (verbose)_printf_(" Generating matrices\n");34 if(verbose)_printf_(" Generating matrices\n"); 35 35 SystemMatricesx(&Kgg, &pg,fem->elements,fem->nodes,fem->vertices,fem->loads,fem->materials,fem->parameters,kflag,pflag); 36 36 37 if (verbose)_printf_(" Generating penalty matrices\n");37 if(verbose)_printf_(" Generating penalty matrices\n"); 38 38 //*Generate penalty system matrices 39 39 PenaltySystemMatricesx(Kgg, pg,NULL,fem->elements,fem->nodes,fem->vertices,fem->loads,fem->materials,fem->parameters,kflag,pflag); 40 40 41 41 /*!Reduce matrix from g to f size:*/ 42 if (verbose)_printf_(" reducing matrix from g to f set\n");42 if(verbose)_printf_(" reducing matrix from g to f set\n"); 43 43 Reducematrixfromgtofx(&Kff,&Kfs,Kgg,fem->Gmn,fem->nodesets); MatFree(&Kgg); 44 44 45 45 /*!Reduce load from g to f size: */ 46 if (verbose)_printf_(" reducing load from g to f set\n");46 if(verbose)_printf_(" reducing load from g to f set\n"); 47 47 Reduceloadfromgtofx(&pf, pg, fem->Gmn, Kfs, fem->ys, fem->nodesets);VecFree(&pg); MatFree(&Kfs); 48 48 49 49 /*Solve: */ 50 if (verbose)_printf_(" solving\n");50 if(verbose)_printf_(" solving\n"); 51 51 Solverx(&uf, Kff, pf, NULL, solver_string); MatFree(&Kff); VecFree(&pf); 52 52 53 53 //Merge back to g set 54 if (verbose)_printf_(" merging solution from f to g set\n");54 if(verbose)_printf_(" merging solution from f to g set\n"); 55 55 Mergesolutionfromftogx(&ug, uf,fem->Gmn,fem->ys,fem->nodesets);VecFree(&uf); 56 56 -
issm/trunk/src/c/solvers/solver_thermal_nonlinear.cpp
r4522 r4524 83 83 MatFree(&Kgg); 84 84 85 /*!Reduce load from g to f size: */ 86 if (verbose) _printf_(" reducing load from g to f set\n"); 85 if(verbose)_printf_(" reducing load from g to f set\n"); 87 86 Reduceloadfromgtofx(&pf, pg, fem->Gmn, Kfs, fem->ys, fem->nodesets); 88 87 … … 100 99 MatFree(&Kff);VecFree(&pf);VecFree(&tg); 101 100 102 //Merge back to g set 103 if (verbose) _printf_(" merging solution from f to g set\n"); 101 if(verbose)_printf_(" merging solution from f to g set\n"); 104 102 Mergesolutionfromftogx(&tg, tf,fem->Gmn,fem->ys,fem->nodesets); 105 103 … … 109 107 110 108 //Deal with penalty loads 111 if (verbose)_printf_(" penalty constraints\n");109 if(verbose)_printf_(" penalty constraints\n"); 112 110 PenaltyConstraintsx(&constraints_converged, &num_unstable_constraints, fem->elements,fem->nodes,fem->vertices,fem->loads,fem->materials,fem->parameters); 113 111
Note:
See TracChangeset
for help on using the changeset viewer.