Changeset 331

Timestamp:

05/11/09 09:37:32 (16 years ago)

Author:

Mathieu Morlighem

Message:

used displaystring in diagnostic_core_nonlinear

File:

• issm/trunk/src/m/solutions/cielo/diagnostic_core_nonlinear.m (modified) (5 diffs)

issm/trunk/src/m/solutions/cielo/diagnostic_core_nonlinear.m

@@ -15 +15 @@
         soln(count).u_f=[];
 
-        if m.parameters.debug,
-                disp(sprintf('\n%s',['   starting direct shooting method']));
-        end
-        
+        displaystring(m.parameters.debug,'\n%s',['   starting direct shooting method']);
         while(~converged),
                 
@@ -49 +46 @@
 
                 %Solve  
-                if m.parameters.debug,
-                        disp(sprintf('%s%g','      condition number of stiffness matrix: ',condest(K_ff)));
-                end
+                displaystring(m.parameters.debug,'\n%s%g','      condition number of stiffness matrix: ',condest(K_ff));
                 [soln(count).u_f]=Solver(K_ff,p_f,[],m.parameters);
         
@@ -75 +70 @@
                 %Relative criterion
                 if (ndu/nu<=m.parameters.eps_rel),
-                        if m.parameters.debug, disp(sprintf('%s %g %s %g','      convergence criterion: norm(du)/norm(u)=',ndu/nu,' < ',m.parameters.eps_rel)); end
+                        displaystring(m.parameters.debug,'%s%g%s%g','      convergence criterion: norm(du)/norm(u)=',ndu/nu,' < ',m.parameters.eps_rel);
                         converged=1;
                 else
-                        if m.parameters.debug, disp(sprintf('%s %g %s %g','      convergence criterion: norm(du)/norm(u)=',ndu/nu,' > ',m.parameters.eps_rel)); end
+                        displaystring(m.parameters.debug,'%s%g%s%g','      convergence criterion: norm(du)/norm(u)=',ndu/nu,' > ',m.parameters.eps_rel);
                         converged=0;
                 end
@@ -85 +80 @@
                 if ~isnan(m.parameters.eps_abs),
                         if (nduinf<=m.parameters.eps_abs),
-                                if m.parameters.debug, disp(sprintf('%s %g %s %g','      convergence criterion: max(du)=',nduinf,' < ',m.parameters.eps_abs)); end
+                                displaystring(m.parameters.debug,'%s%g%s%g','      convergence criterion: max(du)=',nduinf,' < ',m.parameters.eps_abs);
                         else
-                                if m.parameters.debug, disp(sprintf('%s %g %s %g','      convergence criterion: max(du)=',nduinf,' > ',m.parameters.eps_abs)); end
-                                        converged=0;
+                                displaystring(m.parameters.debug,'%s%g%s%g','      convergence criterion: max(du)=',nduinf,' > ',m.parameters.eps_abs);
+                                converged=0;
                         end
                 end
@@ -117 +112 @@
                 varargout(2)={K_fs};
         end
-        
 end