Changeset 6321 for issm/trunk/src/m/solutions/steadystate_core.m

Timestamp:

10/15/10 11:57:42 (15 years ago)

Author:

Mathieu Morlighem

Message:

Moved displaystring to issmprintf (like in C)
synchronized enums
renamed some Verbose routines

File:

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

issm/trunk/src/m/solutions/steadystate_core.m

@@ -17 +17 @@
         while true,
 
-                displaystring(verbose,'\n%s%i\n','computing velocities and temperatures for step: ',step);
+                issmprintf(verbose,'\n%s%i\n','computing velocities and temperatures for step: ',step);
                 femmodel=thermal_core(femmodel); 
 
-                displaystring(verbose,'\n%s',['computing new velocity...']);
+                issmprintf(verbose,'\n%s',['computing new velocity...']);
                 femmodel=diagnostic_core(femmodel); 
 
                 if step>1,
-                        displaystring(verbose,'\n%s',['checking temperature, velocity and pressure convergence...']);
+                        issmprintf(verbose,'\n%s',['checking temperature, velocity and pressure convergence...']);
                         if steadystateconvergence(femmodel), break; end
                 end 
 
-                displaystring(verbose,'\n%s',['saving velocities, temperature and pressure for convergence...']);
+                issmprintf(verbose,'\n%s',['saving velocities, temperature and pressure for convergence...']);
                 femmodel.elements=InputDuplicate(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,VxEnum,VxOldEnum);
                 femmodel.elements=InputDuplicate(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,VyEnum,VyOldEnum);
@@ -40 +40 @@
 
         if (solution_type==SteadystateSolutionEnum & ~control_analysis),
-                displaystring(verbose,'\n%s',['saving results...']);
+                issmprintf(verbose,'\n%s',['saving results...']);
                 femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,VxEnum);
                 femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,VyEnum);