Changeset 2102

Timestamp:

09/03/09 11:37:01 (15 years ago)

Author:

Mathieu Morlighem

Message:

no more control solution

File:

• issm/trunk/src/m/classes/public/process_solve_options.m (modified) (5 diffs)

issm/trunk/src/m/classes/public/process_solve_options.m

@@ -1 +1 @@
 function outoptions=process_solve_options(options)
-%DEFAULT_SOLVE_OPTIONS - set up default options for solve phase
-%
-%   Usage:
+                %DEFAULT_SOLVE_OPTIONS - set up default options for solve phase
+                %
+                %   Usage:
 %      options=process_solve_options(options)
-%
-%   See also: SOLVE,RECOVER_SOLVE_OPTIONS
+                %
+                %   See also: SOLVE,RECOVER_SOLVE_OPTIONS
 
-%package: is there one? check to ''cielo''
-found=0;
-for i=1:size(options,1),
-        if strcmpi(options{i,1},'package'),
+                %package: is there one? check to ''cielo''
+                found=0;
+                for i=1:size(options,1),
+                if strcmpi(options{i,1},'package'),
                 package=options{i,2};
-                found=1;
-                break
-        end
+found=1;
+break
+end
 end
 if ~found,
         disp('recover_solve_options info message: no ''package'' was provided, defaulting to ''cielo''');
-        options(end+1,:)={'package' 'cielo'};
-        package='cielo';
+options(end+1,:)={'package' 'cielo'};
+package='cielo';
 end
 if ~ismemberi(package,{'cielo','ice','macayeal'}),
@@ -28 +28 @@
 found=0;
 for i=1:size(options,1),
-        if strcmpi(options{i,1},'analysis_type'),
-                analysis_type=options{i,2};
-                found=1;
-                break
-        end
+         if strcmpi(options{i,1},'analysis_type'),
+         analysis_type=options{i,2};
+found=1;
+break
+end
 end
 if ~found,
@@ -41 +41 @@
 found=0;
 for i=1:size(options,1),
-        if strcmpi(options{i,1},'sub_analysis_type'),
-                sub_analysis_type=options{i,2};
-                found=1;
-                break
-        end
+         if strcmpi(options{i,1},'sub_analysis_type'),
+         sub_analysis_type=options{i,2};
+found=1;
+break
+end
 end
 if ~found
-        if strcmpi(analysis_type,'control'),
-                disp('recover_solve_options info message: no ''sub_analysis_type'' was provided, defaulting to ''inverse''');
-                sub_analysis_type='inverse';
-        else
-                sub_analysis_type='none';
-        end
+        sub_analysis_type='none';
 end
 
@@ -59 +54 @@
 found=0;
 for i=1:size(options,1),
-        if strcmpi(options{i,1},'batch'),
-                batch=options{i,2};
-                found=1;
-                break
-        end
+         if strcmpi(options{i,1},'batch'),
+         batch=options{i,2};
+found=1;
+break
+end
 end
 if ~found
@@ -70 +65 @@
 
 %check solution type is supported
-if ~ismemberi(analysis_type,{'control','diagnostic','prognostic','thermal','steadystate','parameters','mesh2grid','transient'}),
+if ~ismemberi(analysis_type,{'diagnostic','prognostic','thermal','steadystate','parameters','mesh2grid','transient'}),
         error(['process_solve_options error message: analysis_type ' analysis_type ' not supported yet!']);
 else