Changeset 6321 for issm/trunk/src/m/solutions/diagnostic_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/diagnostic_core.m (modified) (5 diffs)

issm/trunk/src/m/solutions/diagnostic_core.m

@@ -35 +35 @@
         if ishutter,
 
-                displaystring(verbose,'\n%s',['computing hutter velocities...']);
+                issmprintf(verbose,'\n%s',['computing hutter velocities...']);
 
                 %Take the last velocity into account so that the velocity on the MacAyeal domain is not zero
@@ -49 +49 @@
         if xor(ismacayealpattyn,isstokes), %if macayealpattyn and stokes, we must use stokescoupling
 
-                displaystring(verbose,'\n%s',['computing horizontal velocities...']);
+                issmprintf(verbose,'\n%s',['computing horizontal velocities...']);
                 femmodel=SetCurrentConfiguration(femmodel,DiagnosticHorizAnalysisEnum);
                 femmodel=solver_diagnostic_nonlinear(femmodel,modify_loads); 
@@ -56 +56 @@
         if ismacayealpattyn & isstokes,
 
-                displaystring(verbose,'\n%s',['computing coupling velocities for macayealpattyn and stokes...']);
+                issmprintf(verbose,'\n%s',['computing coupling velocities for macayealpattyn and stokes...']);
                 femmodel=SetCurrentConfiguration(femmodel,DiagnosticHorizAnalysisEnum);
                 femmodel=solver_stokescoupling_nonlinear(femmodel,conserve_loads); 
@@ -63 +63 @@
         if dim==3 & (ismacayealpattyn | ishutter) & ~isstokes,
         
-                displaystring(verbose,'\n%s',['computing vertical velocities...']);
+                issmprintf(verbose,'\n%s',['computing vertical velocities...']);
                 femmodel=SetCurrentConfiguration(femmodel,DiagnosticVertAnalysisEnum);
                 femmodel=solver_linear(femmodel);
@@ -69 +69 @@
 
         if (solution_type==DiagnosticSolutionEnum & ~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);