Changeset 6304

Timestamp:

10/14/10 16:20:30 (14 years ago)

Author:

Mathieu Morlighem

Message:

Added verbose class

Location:

issm/trunk/src/m

Files:

• classes/@model/model.m (modified) (1 diff)
• classes/@model/setdefaultparameters.m (modified) (1 diff)
• classes/verbose.m (added)
• model/ismodelselfconsistent.m (modified) (1 diff)
• model/marshall.m (modified) (1 diff)
• model/presolve.m (modified) (1 diff)
• model/solve.m (modified) (3 diffs)
• model/solveparallel.m (modified) (1 diff)
• model/structtomodel.m (modified) (1 diff)
• solutions/NewFemModel.m (modified) (2 diffs)
• solutions/convergence.m (modified) (7 diffs)
• solutions/issm.m (modified) (2 diffs)

issm/trunk/src/m/classes/@model/model.m

@@ -229 +229 @@
         %debugging
         md.verbose=0;
+        md.verbose_binary=0;
         md.element_debug=0;
         md.element_debugid=NaN;

issm/trunk/src/m/classes/@model/setdefaultparameters.m

@@ -88 +88 @@
 %parameter used to print temporary results (convergence criterion,
 %current step,...)
-md.verbose=0;
+md.verbose=verbose;
 
 %Stokes mesh

issm/trunk/src/m/model/ismodelselfconsistent.m

@@ -36 +36 @@
 % Common checks
 %VERBOSE{{{1
-if md.verbose~=floor(abs(md.verbose)),
-        error(['field verbose should be a positive integer']);
+if ~strcmp('verbose',class(md.verbose))
+        disp('WARNING: md.verbose must now be an object of class ''verbose''');
+        disp('         To update your model use the following command:');
+        disp(' ');
+        disp('         md.verbose=verbose;');
+        disp(' ');
+        error(['field verbose should be of class ''verbose'' ']);
 end
 %}}}

issm/trunk/src/m/model/marshall.m

@@ -109 +109 @@
 WriteData(fid,md.meanvel,'Scalar','meanvel');
 WriteData(fid,md.epsvel,'Scalar','epsvel');
-WriteData(fid,md.verbose,'Integer','verbose');
+WriteData(fid,md.verbose_binary,'Integer','verbose_binary');
 WriteData(fid,md.plot,'Integer','plot');
 WriteData(fid,md.output_frequency,'Integer','output_frequency');

issm/trunk/src/m/model/presolve.m

@@ -8 +8 @@
 md.inputfilename=[md.name '.bin'];
 md.outputfilename=[md.name '.outbin'];
+
+%verbose;
+md.verbose_binary=VerboseToBinary(md.verbose);
 
 %deal with control methods

issm/trunk/src/m/model/solve.m

@@ -28 +28 @@
 
 %check model consistency
-displaystring(md.verbose,'\n%s\n','checking model consistency');
+disp('checking model consistency');
 ismodelselfconsistent(md),
 
@@ -43 +43 @@
 assignin('base',inputname(1),md);
 
-displaystring(md.verbose,'\n%s\n','launching solution sequence');
+disp('launching solution sequence');
 
 %If running in parallel, we have a different way of launching the solution
@@ -63 +63 @@
 
 %Check result is consistent
-displaystring(md.verbose,'%s\n','checking result consistency');
+disp('checking result consistency');
 %if ~isresultconsistent(md,options.analysis_type),
 %       disp('!! results not consistent correct the model !!') %it would be very cruel to put an error, it would kill the computed results (even if not consistent...)

issm/trunk/src/m/model/solveparallel.m

@@ -37 +37 @@
                 else
                         %load results
-                        displaystring(md.verbose,'loading results from cluster');
+                        disp('loading results from cluster');
                         md=loadresultsfromcluster(md);
                 end

issm/trunk/src/m/model/structtomodel.m

@@ -33 +33 @@
         if strcmpi(structmd.type,'3d'), md.dim=3; end
 end
+if isnumeric(md.verbose), md.verbose=verbose; end
 
 %New fields

issm/trunk/src/m/solutions/NewFemModel.m

@@ -9 +9 @@
 %
 
+        %Set verbosity
+        SetVerbosityLevel(md.verbose_binary);
+
+   %Dynamically allocate whatever is a list of length nummodels: */
    femmodel.solution_type=solution_type;
    femmodel.analysis_counter=nummodels; %point to last analysis_type carried out
-
-   %Dynamically allocate whatever is a list of length nummodels: */
    femmodel.analysis_type_list=analysis_types;
 
-   displaystring(md.verbose,'\n   reading data from model %s...',md.name);
+        displaystring(VerbModProc(),'\n   reading data from model %s...',md.name);
    [femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.constraints,femmodel.loads,femmodel.materials,femmodel.parameters]=ModelProcessor(md,solution_type,femmodel.analysis_type_list);
    
@@ -27 +29 @@
 
                 analysis_type=femmodel.analysis_type_list(i);
-                displaystring(md.verbose,'%s%s','   dealing with analysis type: ',EnumToString(analysis_type));
+                displaystring(VerbModProc(),'%s%s','   dealing with analysis type: ',EnumToString(analysis_type));
 
                 femmodel=SetCurrentConfiguration(femmodel,analysis_type);
 
                 if i==1, %only  create vertices dofs once!
-                        displaystring(md.verbose,'%s','      generating vertices degrees of freedom');
+                        displaystring(VerbModProc(),'%s','      generating vertices degrees of freedom');
                         femmodel.vertices=VerticesDof(femmodel.vertices, femmodel.parameters); 
                 end
 
-                displaystring(md.verbose,'%s','      resolve node constraints');
+                displaystring(VerbModProc(),'%s','      resolve node constraints');
                 [femmodel.nodes]=SpcNodes(femmodel.nodes,femmodel.constraints,analysis_type);
 
-                displaystring(md.verbose,'%s','      create nodal degrees of freedom');
+                displaystring(VerbModProc(),'%s','      create nodal degrees of freedom');
                 [femmodel.nodes]=NodesDof(femmodel.nodes,femmodel.parameters);
 
-                displaystring(md.verbose,'%s','      create nodal constraints vector');
+                displaystring(VerbModProc(),'%s','      create nodal constraints vector');
                 femmodel.m_ys{i}=CreateNodalConstraints(femmodel.nodes,analysis_type);
 
-                displaystring(md.verbose,'%s','      create node sets');
+                displaystring(VerbModProc(),'%s','      create node sets');
                 femmodel.m_nodesets{i}=BuildNodeSets(femmodel.nodes,analysis_type);
 
-                displaystring(md.verbose,'%s','      configuring elements and loads');
+                displaystring(VerbModProc(),'%s','      configuring elements and loads');
                 [femmodel.elements,femmodel.loads,femmodel.nodes,femmodel.parameters] = ConfigureObjects( femmodel.elements, femmodel.loads, femmodel.nodes, femmodel.vertices,femmodel.materials,femmodel.parameters);
         end

issm/trunk/src/m/solutions/convergence.m

@@ -5 +5 @@
 
 %Get convergence options
-verbose=parameters.Verbose;
 yts=parameters.Yts;
 eps_res=parameters.EpsRes;
@@ -13 +12 @@
 %initialization
 converged=false;
-displaystring(verbose,' ');
 
 %Display solver caracteristics
-if (verbose>1),
+if (VerbConverge()),
         solver_res=norm(K_ff*u_f-p_f,2)/norm(p_f,2);
-        displaystring(verbose>1,'%s%g','      condition number of stiffness matrix: ',condest(K_ff));
-        displaystring(verbose>1,'%s%g','      solver residue: norm(KU-F)/norm(F)=',solver_res);
+        displaystring(VerbConverge(),'%s%g','      condition number of stiffness matrix: ',condest(K_ff));
+        displaystring(VerbConverge(),'%s%g','      solver residue: norm(KU-F)/norm(F)=',solver_res);
 end
 
@@ -28 +26 @@
 end
 if (res<=eps_res),
-        displaystring(verbose,'%-60s%g%s%g%s','      mechanical equilibrium convergence criterion',res*100,' < ',eps_res*100,' %');
+        displaystring(VerbConverge(),'%-60s%g%s%g%s','      mechanical equilibrium convergence criterion',res*100,' < ',eps_res*100,' %');
         converged=true;
 else
-        displaystring(verbose,'%-60s%g%s%g%s','      mechanical equilibrium convergence criterion',res*100,' > ',eps_res*100,' %');
+        displaystring(VerbConverge(),'%-60s%g%s%g%s','      mechanical equilibrium convergence criterion',res*100,' > ',eps_res*100,' %');
         converged=false;
 end
 
 %Relative criterion (optional)
-if ((~isnan(eps_rel)) | (verbose>1)),
+if ((~isnan(eps_rel)) | (VerbConverge())),
 
         %compute ndu/nu
@@ -50 +48 @@
                 if nu, %avoid "dividing by zero" warning
                         if (ndu/nu<=eps_rel),
-                                displaystring(verbose,'%-60s%g%s%g%s','      relative convergence criterion: norm(du)/norm(u)',ndu/nu*100,' < ',eps_rel*100,' %');
+                                displaystring(VerbConverge(),'%-60s%g%s%g%s','      relative convergence criterion: norm(du)/norm(u)',ndu/nu*100,' < ',eps_rel*100,' %');
                         else
-                                displaystring(verbose,'%-60s%g%s%g%s','      relative convergence criterion: norm(du)/norm(u)',ndu/nu*100,' > ',eps_rel*100,' %');
+                                displaystring(VerbConverge(),'%-60s%g%s%g%s','      relative convergence criterion: norm(du)/norm(u)',ndu/nu*100,' > ',eps_rel*100,' %');
                                 converged=false;
                         end
@@ -60 +58 @@
         else
                 if nu, %avoid "dividing by zero" warning
-                        displaystring(verbose,'%-60s%g%s','      relative convergence criterion: norm(du)/norm(u)',ndu/nu*100,' %');
+                        displaystring(VerbConverge(),'%-60s%g%s','      relative convergence criterion: norm(du)/norm(u)',ndu/nu*100,' %');
                 end
         end
@@ -67 +65 @@
 
 %Absolute criterion (optional)
-if ((~isnan(eps_abs)) | (verbose>1)),
+if ((~isnan(eps_abs)) | VerbConverge()),
 
         %compute max(du)
@@ -79 +77 @@
         if ~isnan(eps_abs),
                 if (nduinf<=eps_abs),
-                        displaystring(verbose,'%-60s%g%s%g%s','      absolute convergence criterion: max(du)',nduinf,' < ',eps_abs,' m/yr');
+                        displaystring(VerbConverge(),'%-60s%g%s%g%s','      absolute convergence criterion: max(du)',nduinf,' < ',eps_abs,' m/yr');
                 else
-                        displaystring(verbose,'%-60s%g%s%g%s','      absolute convergence criterion: max(du)',nduinf,' > ',eps_abs,' m/yr');
+                        displaystring(VerbConverge(),'%-60s%g%s%g%s','      absolute convergence criterion: max(du)',nduinf,' > ',eps_abs,' m/yr');
                         converged=false;
                 end
         else
-                displaystring(verbose,'%-60s%g%s','      absolute convergence criterion: max(du)',nduinf,' m/yr');
+                displaystring(VerbConverge(),'%-60s%g%s','      absolute convergence criterion: max(du)',nduinf,' m/yr');
         end
 

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

@@ -11 +11 @@
         [analyses,numanalyses,solutioncore]=SolutionConfiguration(solution_type);
 
-        displaystring(md.verbose,'%s',['create finite element model']);
+        disp('create finite element model');
         femmodel=NewFemModel(md,solution_type,analyses,numanalyses);
 
@@ -37 +37 @@
         %stop timing
         t2=clock;
-        displaystring(md.verbose,'\n%s\n',['solution converged in ' num2str(etime(t2,t1)) ' seconds']);
+        disp(['solution converged in ' num2str(etime(t2,t1)) ' seconds']);