Changeset 12515 for issm/trunk-jpl/src/c/solutions/transient_core.cpp

Timestamp:

06/22/12 16:56:14 (13 years ago)

Author:

Mathieu Morlighem

Message:

Starting to replace _printf by _pprintString

File:

• issm/trunk-jpl/src/c/solutions/transient_core.cpp (modified) (6 diffs)

issm/trunk-jpl/src/c/solutions/transient_core.cpp

@@ -86 +86 @@
                 femmodel->parameters->SetParam(step,StepEnum);
 
-                _printf_(VerboseSolution(),"iteration %i/%g  time [yr]: %-7.3g (time step: %.2g)\n",step,floor((finaltime-time)/dt)+step,time/yts,dt/yts);
+                if(VerboseSolution()) _pprintLine_("iteration " << step << "/" << floor((finaltime-time)/dt)+step << "  time [yr]: " << time/yts << "7.3g (time step: " << dt/yts << "2g)");
                 if(step%output_frequency==0 || time==finaltime)
                  save_results=true;
@@ -94 +94 @@
 
                 if(isthermal && dim==3){
-                        _printf_(VerboseSolution(),"   computing temperatures\n");
+                        if(VerboseSolution()) _pprintLine_("   computing temperatures");
                         #ifdef _HAVE_THERMAL_
                         if(isenthalpy==0){
@@ -108 +108 @@
 
                 if(isdiagnostic){
-                        _printf_(VerboseSolution(),"   computing new velocity\n");
+                        if(VerboseSolution()) _pprintLine_("   computing new velocity");
                         #ifdef _HAVE_DIAGNOSTIC_
                         diagnostic_core(femmodel);
@@ -117 +117 @@
 
                 if(isprognostic){
-                        _printf_(VerboseSolution(),"   computing new thickness\n");
+                        if(VerboseSolution()) _pprintLine_("   computing new thickness");
                         prognostic_core(femmodel);
-                        _printf_(VerboseSolution(),"   updating vertices positions\n");
+                        if(VerboseSolution()) _pprintLine_("   updating vertices positions");
                         UpdateVertexPositionsx(femmodel->elements, femmodel->nodes,femmodel->vertices,femmodel->loads, femmodel->materials, femmodel->parameters); 
                 }
 
                 if(isgroundingline){
-                        _printf_(VerboseSolution(),"   computing new grounding line position\n");
+                        if(VerboseSolution()) _pprintLine_("   computing new grounding line position");
                         #ifdef _HAVE_GROUNDINGLINE_
                         GroundinglineMigrationx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
@@ -134 +134 @@
                 /*unload results*/
                 if(save_results){
-                        _printf_(VerboseSolution(),"   saving transient results\n");
+                        if(VerboseSolution()) _pprintLine_("   saving transient results");
                         InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,SurfaceEnum);
                         InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BedEnum);
@@ -141 +141 @@
                         RequestedOutputsx(femmodel->results,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,requested_outputs,numoutputs);
 
-                        _printf_(VerboseSolution(),"   saving temporary results\n");
+                        if(VerboseSolution()) _pprintLine_("   saving temporary results");
                         OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,femmodel->results);
                 }