Changeset 6412 for issm/trunk/src/c/solutions/steadystate_core.cpp

Timestamp:

10/25/10 08:57:04 (15 years ago)

Author:

Mathieu Morlighem

Message:

moved ISSMERROR to _error_, ISSMASSERT to _assert_ and ISSMPRINTF to _printf_

File:

• issm/trunk/src/c/solutions/steadystate_core.cpp (modified) (2 diffs)

issm/trunk/src/c/solutions/steadystate_core.cpp

@@ -32 +32 @@
         for(;;){
         
-                ISSMPRINTF(VerboseSolution(),"%s%i\n","   computing temperature and velocity for step: ",step);
+                _printf_(VerboseSolution(),"%s%i\n","   computing temperature and velocity for step: ",step);
                 thermal_core(femmodel);
 
-                ISSMPRINTF(VerboseSolution(),"%s\n","   computing new velocity");
+                _printf_(VerboseSolution(),"%s\n","   computing new velocity");
                 diagnostic_core(femmodel);
 
                 if (step>1){
-                        ISSMPRINTF(VerboseSolution(),"%s\n","   checking velocity, temperature and pressure convergence");
+                        _printf_(VerboseSolution(),"%s\n","   checking velocity, temperature and pressure convergence");
                         if(steadystateconvergence(femmodel)) break;
                 }
                 
-                ISSMPRINTF(VerboseSolution(),"%s\n","   saving velocity, temperature and pressure to check for convergence at next step");
+                _printf_(VerboseSolution(),"%s\n","   saving velocity, temperature and pressure to check for convergence at next step");
                 InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VxEnum,VxOldEnum);
                 InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VyEnum,VyOldEnum);
@@ -55 +55 @@
         
         if(solution_type==SteadystateSolutionEnum && !control_analysis){
-                ISSMPRINTF(VerboseSolution(),"   saving results\n");
+                _printf_(VerboseSolution(),"   saving results\n");
                 InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VxEnum);
                 InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VyEnum);