Changeset 9822

Timestamp:

09/16/11 12:21:52 (14 years ago)

Author:

Mathieu Morlighem

Message:

fixed disp for solver

File:

• issm/trunk/src/m/classes/solver.m (modified) (2 diffs)

issm/trunk/src/m/classes/solver.m

@@ -79 +79 @@
                          fclose(fid);
                  end %}}}
-                 function string=PetscString(solver) % {{{
-
-                         %initialize string: 
-                         string='';
-
-                         %start writing options
-                         for i=1:length(solver),
-                                 option=solver{i};
-                                 if isempty(option),
-                                         %do nothing
-                                 elseif length(option)==1,
-                                         %this option has only one argument
-                                         string=[string ' -' option{1}];
-                                 elseif length(option)==2,
-                                         %option with value. value can be string or scalar
-                                         if isscalar(option{2}),
-                                                 string=[string ' -' option{1} ' ' num2str(option{2})];
-                                         elseif ischar(option{2}),
-                                                 string=[string ' -' option{1} ' ' option{2}];
-                                         else
-                                                 error(['PetscString error: option #' num2str(i) ' is not well formatted']);
-                                         end
-                                 else 
-                                         error(['PetscString error: option #' num2str(i) ' is not well formatted']);
-                                 end
-                         end
-                 end % }}}
                  function disp(obj) % {{{1
                         disp(sprintf('   solver parameters:'));
@@ -112 +85 @@
                                 analysis=obj.options{i,1};
                                 ioptions=obj.options{i,2};
-                                string=PetscString(ioptions);
+
+                                string='';
+                                for i=1:length(ioptions),
+                                        option=ioptions{i};
+                                        if isempty(option),
+                                                %do nothing
+                                        elseif length(option)==1,
+                                                %this option has only one argument
+                                                string=[string ' -' option{1}];
+                                        elseif length(option)==2,
+                                                %option with value. value can be string or scalar
+                                                if isscalar(option{2}),
+                                                        string=[string ' -' option{1} ' ' num2str(option{2})];
+                                                elseif ischar(option{2}),
+                                                        string=[string ' -' option{1} ' ' option{2}];
+                                                else
+                                                        error(['PetscString error: option #' num2str(i) ' is not well formatted']);
+                                                end
+                                        else 
+                                                error(['PetscString error: option #' num2str(i) ' is not well formatted']);
+                                        end
+                                end
+
                                 disp(sprintf('   %s -> ''%s''',EnumToString(analysis),string));
                         end