Changeset 11388

Timestamp:

02/10/12 07:21:59 (13 years ago)

Author:

Mathieu Morlighem

Message:

No more Enums in solver, convert enum to string so that old models still work

File:

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

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

@@ -6 +6 @@
 classdef solver
     properties (SetAccess=public) 
-                 options={NoneAnalysisEnum,mumpsoptions};
+                 options=cell(0,0);
          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
+                 function obj = addoptions(obj,analysis,solveroptions) % {{{1
+
+                         %Convert analysis from enum to string
+                         analysis=EnumToString(analysis);
+
                          %first, find out if analysis has already been supplied
                          found=false;
                          for i=1:size(obj.options,1),
                                  inanalysis=obj.options{i,1};
-                                 if inanalysis==analysis,
+                                 if strcmp(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
@@ -70 +78 @@
 
                                  %first write analysis:
-                                 fprintf(fid,'\n+%s\n',EnumToString(analysis)); %append a + to recognize it's an analysis enum
+                                 fprintf(fid,'\n+%s\n',analysis); %append a + to recognize it's an analysis enum
 
                                  %now, write options
@@ -126 +134 @@
                                 end
 
-                                disp(sprintf('   %s -> ''%s''',EnumToString(analysis),string));
+                                disp(sprintf('   %s -> ''%s''',analysis,string));
                         end
                  end