Changeset 4524


Ignore:
Timestamp:
07/12/10 10:53:08 (15 years ago)
Author:
Eric.Larour
Message:

cosmetic

Location:
issm/trunk/src/c/solvers
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk/src/c/solvers/solver_diagnostic_nonlinear.cpp

    r4339 r4524  
    6868                VecFree(&old_uf);old_uf=uf;
    6969
    70                 if (verbose) _printf_("   Generating matrices\n");
     70                if(verbose)_printf_("   Generating matrices\n");
    7171                SystemMatricesx(&Kgg, &pg,femmodel->elements,femmodel->nodes,femmodel->vertices,loads,femmodel->materials,femmodel->parameters,kflag,pflag);
    7272
    73                 if (verbose) _printf_("   Generating penalty matrices\n");
     73                if(verbose)_printf_("   Generating penalty matrices\n");
    7474                PenaltySystemMatricesx(Kgg, pg,NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,loads,femmodel->materials,femmodel->parameters,kflag,pflag);
    7575               
    76                 if (verbose) _printf_("   reducing matrix from g to f set\n");
     76                if(verbose)_printf_("   reducing matrix from g to f set\n");
    7777                Reducematrixfromgtofx(&Kff,&Kfs,Kgg,femmodel->Gmn,femmodel->nodesets);
    7878
     
    8080                MatFree(&Kgg);
    8181       
    82                 if (verbose) _printf_("   reducing load from g to f set\n");
     82                if(verbose)_printf_("   reducing load from g to f set\n");
    8383                Reduceloadfromgtofx(&pf, pg, femmodel->Gmn, Kfs, femmodel->ys, femmodel->nodesets);
    8484
     
    8787                MatFree(&Kfs);
    8888
    89                 if (verbose) _printf_("   solving\n");
     89                if(verbose)_printf_("   solving\n");
    9090                Solverx(&uf, Kff, pf, old_uf, solver_string);
    9191
    92                 if (verbose) _printf_("   merging solution from f to g set\n");
     92                if(verbose)_printf_("   merging solution from f to g set\n");
    9393                Mergesolutionfromftogx(&ug, uf,femmodel->Gmn,femmodel->ys,femmodel->nodesets);
    9494
     
    9696                InputUpdateFromSolutionx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,ug);
    9797
    98                 if (verbose) _printf_("   penalty constraints\n");
     98                if(verbose)_printf_("   penalty constraints\n");
    9999                PenaltyConstraintsx(&constraints_converged, &num_unstable_constraints, femmodel->elements,femmodel->nodes,femmodel->vertices,loads,femmodel->materials,femmodel->parameters);
    100100
  • issm/trunk/src/c/solvers/solver_linear.cpp

    r4247 r4524  
    3232
    3333        //*Generate system matrices
    34         if (verbose) _printf_("   Generating matrices\n");
     34        if(verbose)_printf_("   Generating matrices\n");
    3535        SystemMatricesx(&Kgg, &pg,fem->elements,fem->nodes,fem->vertices,fem->loads,fem->materials,fem->parameters,kflag,pflag);
    3636
    37         if (verbose) _printf_("   Generating penalty matrices\n");
     37        if(verbose)_printf_("   Generating penalty matrices\n");
    3838        //*Generate penalty system matrices
    3939        PenaltySystemMatricesx(Kgg, pg,NULL,fem->elements,fem->nodes,fem->vertices,fem->loads,fem->materials,fem->parameters,kflag,pflag);
    4040
    4141        /*!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");
    4343        Reducematrixfromgtofx(&Kff,&Kfs,Kgg,fem->Gmn,fem->nodesets); MatFree(&Kgg);
    4444
    4545        /*!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");
    4747        Reduceloadfromgtofx(&pf, pg, fem->Gmn, Kfs, fem->ys, fem->nodesets);VecFree(&pg); MatFree(&Kfs);
    4848
    4949        /*Solve: */
    50         if (verbose) _printf_("   solving\n");
     50        if(verbose)_printf_("   solving\n");
    5151        Solverx(&uf, Kff, pf, NULL, solver_string); MatFree(&Kff); VecFree(&pf);
    5252
    5353        //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");
    5555        Mergesolutionfromftogx(&ug, uf,fem->Gmn,fem->ys,fem->nodesets);VecFree(&uf);
    5656
  • issm/trunk/src/c/solvers/solver_thermal_nonlinear.cpp

    r4522 r4524  
    8383                MatFree(&Kgg);
    8484       
    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");
    8786                Reduceloadfromgtofx(&pf, pg, fem->Gmn, Kfs, fem->ys, fem->nodesets);
    8887
     
    10099                MatFree(&Kff);VecFree(&pf);VecFree(&tg);
    101100
    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");
    104102                Mergesolutionfromftogx(&tg, tf,fem->Gmn,fem->ys,fem->nodesets);
    105103
     
    109107
    110108                //Deal with penalty loads
    111                 if (verbose) _printf_("   penalty constraints\n");
     109                if(verbose)_printf_("   penalty constraints\n");
    112110                PenaltyConstraintsx(&constraints_converged, &num_unstable_constraints, fem->elements,fem->nodes,fem->vertices,fem->loads,fem->materials,fem->parameters);
    113111
Note: See TracChangeset for help on using the changeset viewer.