Changeset 11425 for issm/trunk-jpl-damage/src/m/classes/solver.m

Timestamp:

02/14/12 09:27:32 (13 years ago)

Author:

cborstad

Message:

reverted to revision 11411: working to resolve some missed changes during initial branch

File:

• issm/trunk-jpl-damage/src/m/classes/solver.m (modified) (4 diffs)

issm/trunk-jpl-damage/src/m/classes/solver.m

@@ -6 +6 @@
 classdef solver
     properties (SetAccess=public) 
-                 options=cell(0,0);
+                 options={NoneAnalysisEnum,mumpsoptions};
          end
          methods
@@ -26 +26 @@
                  function obj = setdefaultparameters(obj) % {{{
 
-                         %MUMPS is the default solver
-                         obj.options={'NoneAnalysis',mumpsoptions};
-
                  end % }}}
-                 function obj = addoptions(obj,analysis,solveroptions) % {{{1
-
-                         %Convert analysis from enum to string
-                         analysis=EnumToString(analysis);
-
+                 function obj=addoptions(obj,analysis,solveroptions) % {{{1
                          %first, find out if analysis has already been supplied
                          found=false;
                          for i=1:size(obj.options,1),
                                  inanalysis=obj.options{i,1};
-                                 if strcmp(inanalysis,analysis),
+                                 if inanalysis==analysis,
                                          found=true;
-                                         obj.options{i,1} = analysis;
-                                         obj.options{i,2} = solveroptions;
+                                         obj.options{i,1}=analysis;
+                                         obj.options{i,2}=solveroptions;
                                          break;
                                  end
                          end
-
                          if ~found,
-                                 obj.options{end+1,1}= analysis;
-                                 obj.options{end,2}  = solveroptions;
+                                 obj.options{end+1,1}=analysis;
+                                 obj.options{end,2}=solveroptions;
                          end
                  end
                  %}}}
                  function checkconsistency(obj,md,solution,analyses) % {{{
-                         for i=1:size(obj.options,1),
-                                 if ~ischar(obj.options{i,1}),
-                                         checkmessage('solver is not well formatted: Analyses are not strings');
-                                 end
-                         end
+
                  end % }}}
                  function PetscFile(solver,filename) % {{{
@@ -82 +70 @@
 
                                  %first write analysis:
-                                 fprintf(fid,'\n+%s\n',analysis); %append a + to recognize it's an analysis enum
+                                 fprintf(fid,'\n+%s\n',EnumToString(analysis)); %append a + to recognize it's an analysis enum
 
                                  %now, write options
@@ -138 +126 @@
                                 end
 
-                                disp(sprintf('   %s -> ''%s''',analysis,string));
+                                disp(sprintf('   %s -> ''%s''',EnumToString(analysis),string));
                         end
                  end