Changeset 13975 for issm/trunk/src/m/classes/verbose.m

Timestamp:

11/16/12 08:10:16 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 13974

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/classes/verbose.m (modified) (6 diffs)

issm/trunk/src/m/classes/verbose.m

@@ -9 +9 @@
 %      control     : control method
 %      qmu         : sensitivity analysis
+%      autodiff    : AD analysis
 %
 %   Usage:
@@ -23 +24 @@
                 % {{{
                 %BEGINFIELDS
-                mprocessor  = false;
-                module      = false;
-                solution    = false;
-                solver      = false;
-                convergence = false;
-                control     = false;
-                qmu         = false;
+                mprocessor=false;
+                module=false;
+                solution=false;
+                solver=false;
+                convergence=false;
+                control=false;
+                qmu=false;
+                autodiff=false;
                 %ENDFIELDS
                 % }}}
@@ -83 +85 @@
                 if (verbose.control), binary=bitor(binary,32); end
                 if (verbose.qmu), binary=bitor(binary,64); end
+                if (verbose.autodiff), binary=bitor(binary,128); end
                 %ENDVERB2BIN
 
@@ -90 +93 @@
 
                 %BEGINBIN2VERB
-                verbose.mprocessor =logical(bitand(binary, 1));
-                verbose.module     =logical(bitand(binary, 2));
-                verbose.solution   =logical(bitand(binary, 4));
-                verbose.solver     =logical(bitand(binary, 8));
-                verbose.convergence=logical(bitand(binary,16));
-                verbose.control    =logical(bitand(binary,32));
-                verbose.qmu        =logical(bitand(binary,64));
+                if bitand(binary,1), verbose.mprocessor=true; else verbose.mprocessor=false; end
+                if bitand(binary,2), verbose.module=true; else verbose.module=false; end
+                if bitand(binary,4), verbose.solution=true; else verbose.solution=false; end
+                if bitand(binary,8), verbose.solver=true; else verbose.solver=false; end
+                if bitand(binary,16), verbose.convergence=true; else verbose.convergence=false; end
+                if bitand(binary,32), verbose.control=true; else verbose.control=false; end
+                if bitand(binary,64), verbose.qmu=true; else verbose.qmu=false; end
+                if bitand(binary,128), verbose.autodiff=true; else verbose.autodiff=false; end
                 %ENDBIN2VERB
 
@@ -105 +109 @@
                 end % }}}
                 function disp(verbose) % {{{
-                        
+
                 %BEGINDISP
                 disp(sprintf('class ''%s''  = ',class(verbose)));
@@ -115 +119 @@
                 disp(sprintf('   %15s : %s','control',mat2str(verbose.control)));
                 disp(sprintf('   %15s : %s','qmu',mat2str(verbose.qmu)));
+                disp(sprintf('   %15s : %s','autodiff',mat2str(verbose.autodiff)));
                 %ENDDISP