Changeset 4524

Timestamp:

07/12/10 10:53:08 (15 years ago)

Author:

Eric.Larour

Message:

cosmetic

Location:

issm/trunk/src/c/solvers

Files:

• solver_diagnostic_nonlinear.cpp (modified) (4 diffs)
• solver_linear.cpp (modified) (1 diff)
• solver_thermal_nonlinear.cpp (modified) (3 diffs)

issm/trunk/src/c/solvers/solver_diagnostic_nonlinear.cpp

@@ -68 +68 @@
                 VecFree(&old_uf);old_uf=uf;
 
-                if (verbose) _printf_("   Generating matrices\n");
+                if(verbose)_printf_("   Generating matrices\n");
                 SystemMatricesx(&Kgg, &pg,femmodel->elements,femmodel->nodes,femmodel->vertices,loads,femmodel->materials,femmodel->parameters,kflag,pflag);
 
-                if (verbose) _printf_("   Generating penalty matrices\n");
+                if(verbose)_printf_("   Generating penalty matrices\n");
                 PenaltySystemMatricesx(Kgg, pg,NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,loads,femmodel->materials,femmodel->parameters,kflag,pflag);
                 
-                if (verbose) _printf_("   reducing matrix from g to f set\n");
+                if(verbose)_printf_("   reducing matrix from g to f set\n");
                 Reducematrixfromgtofx(&Kff,&Kfs,Kgg,femmodel->Gmn,femmodel->nodesets);
 
@@ -80 +80 @@
                 MatFree(&Kgg);
         
-                if (verbose) _printf_("   reducing load from g to f set\n");
+                if(verbose)_printf_("   reducing load from g to f set\n");
                 Reduceloadfromgtofx(&pf, pg, femmodel->Gmn, Kfs, femmodel->ys, femmodel->nodesets);
 
@@ -87 +87 @@
                 MatFree(&Kfs);
 
-                if (verbose) _printf_("   solving\n");
+                if(verbose)_printf_("   solving\n");
                 Solverx(&uf, Kff, pf, old_uf, solver_string);
 
-                if (verbose) _printf_("   merging solution from f to g set\n");
+                if(verbose)_printf_("   merging solution from f to g set\n");
                 Mergesolutionfromftogx(&ug, uf,femmodel->Gmn,femmodel->ys,femmodel->nodesets);
 
@@ -96 +96 @@
                 InputUpdateFromSolutionx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,ug);
 
-                if (verbose) _printf_("   penalty constraints\n");
+                if(verbose)_printf_("   penalty constraints\n");
                 PenaltyConstraintsx(&constraints_converged, &num_unstable_constraints, femmodel->elements,femmodel->nodes,femmodel->vertices,loads,femmodel->materials,femmodel->parameters);
 

issm/trunk/src/c/solvers/solver_linear.cpp

@@ -32 +32 @@
 
         //*Generate system matrices
-        if (verbose) _printf_("   Generating matrices\n");
+        if(verbose)_printf_("   Generating matrices\n");
         SystemMatricesx(&Kgg, &pg,fem->elements,fem->nodes,fem->vertices,fem->loads,fem->materials,fem->parameters,kflag,pflag);
 
-        if (verbose) _printf_("   Generating penalty matrices\n");
+        if(verbose)_printf_("   Generating penalty matrices\n");
         //*Generate penalty system matrices
         PenaltySystemMatricesx(Kgg, pg,NULL,fem->elements,fem->nodes,fem->vertices,fem->loads,fem->materials,fem->parameters,kflag,pflag);
 
         /*!Reduce matrix from g to f size:*/
-        if (verbose) _printf_("   reducing matrix from g to f set\n");
+        if(verbose)_printf_("   reducing matrix from g to f set\n");
         Reducematrixfromgtofx(&Kff,&Kfs,Kgg,fem->Gmn,fem->nodesets); MatFree(&Kgg);
 
         /*!Reduce load from g to f size: */
-        if (verbose) _printf_("   reducing load from g to f set\n");
+        if(verbose)_printf_("   reducing load from g to f set\n");
         Reduceloadfromgtofx(&pf, pg, fem->Gmn, Kfs, fem->ys, fem->nodesets);VecFree(&pg); MatFree(&Kfs);
 
         /*Solve: */
-        if (verbose) _printf_("   solving\n");
+        if(verbose)_printf_("   solving\n");
         Solverx(&uf, Kff, pf, NULL, solver_string); MatFree(&Kff); VecFree(&pf);
 
         //Merge back to g set
-        if (verbose) _printf_("   merging solution from f to g set\n");
+        if(verbose)_printf_("   merging solution from f to g set\n");
         Mergesolutionfromftogx(&ug, uf,fem->Gmn,fem->ys,fem->nodesets);VecFree(&uf);
 

issm/trunk/src/c/solvers/solver_thermal_nonlinear.cpp

@@ -83 +83 @@
                 MatFree(&Kgg);
         
-                /*!Reduce load from g to f size: */
-                if (verbose) _printf_("   reducing load from g to f set\n");
+                if(verbose)_printf_("   reducing load from g to f set\n");
                 Reduceloadfromgtofx(&pf, pg, fem->Gmn, Kfs, fem->ys, fem->nodesets);
 
@@ -100 +99 @@
                 MatFree(&Kff);VecFree(&pf);VecFree(&tg);
 
-                //Merge back to g set
-                if (verbose) _printf_("   merging solution from f to g set\n");
+                if(verbose)_printf_("   merging solution from f to g set\n");
                 Mergesolutionfromftogx(&tg, tf,fem->Gmn,fem->ys,fem->nodesets);
 
@@ -109 +107 @@
 
                 //Deal with penalty loads
-                if (verbose) _printf_("   penalty constraints\n");
+                if(verbose)_printf_("   penalty constraints\n");
                 PenaltyConstraintsx(&constraints_converged, &num_unstable_constraints, fem->elements,fem->nodes,fem->vertices,fem->loads,fem->materials,fem->parameters);