Changeset 1650

Timestamp:

08/11/09 15:13:09 (16 years ago)

Author:

Mathieu Morlighem

Message:

Analysis_types are now always Enums not strings

Location:

issm/trunk/src/m/classes/public

Files:

• BuildQueueingScriptGeneric.m (modified) (1 diff)
• marshall.m (modified) (1 diff)
• process_solve_options.m (modified) (3 diffs)
• solve.m (modified) (2 diffs)

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

@@ -15 +15 @@
 fprintf(fid,'#!/bin/sh\n');
 fprintf(fid,'rm -rf %s/%s.lock\n',executionpath,md.name);
-fprintf(fid,'mpirun -np %i %s/%s.exe %s %s.bin %s.outbin %s.lock  2> %s.errlog >%s.outlog & ',md.np,codepath,md.analysis_type,executionpath,md.name,md.name,md.name,md.name,md.name);
+fprintf(fid,'mpirun -np %i %s/%s.exe %s %s.bin %s.outbin %s.lock  2> %s.errlog >%s.outlog & ',md.np,codepath,AnalysisTypeAsEnum(md.analysis_type),executionpath,md.name,md.name,md.name,md.name,md.name);
 fclose(fid);

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

@@ -22 +22 @@
 end
 
-WriteData(fid,md.analysis_type','String','analysis_type');
-WriteData(fid,md.sub_analysis_type','String','sub_analysis_type');
+WriteData(fid,md.analysis_type','Integer','analysis_type');
+WriteData(fid,md.sub_analysis_type','Integer','sub_analysis_type');
 WriteData(fid,md.type,'String','type');
 WriteData(fid,md.numberofgrids,'Integer','numberofgrids');

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

@@ -6 +6 @@
 %
 %   See also: SOLVE,RECOVER_SOLVE_OPTIONS
-
-%analysis_type: check on this option, error out otherwise
-found=0;
-for i=1:size(options,1),
-        if strcmpi(options{i,1},'analysis_type'),
-                analysis_type=options{i,2};
-                found=1;
-        end
-end
-if ~found,
-        error('recover_solve_options error message: no ''analysis_type'' was provided');
-end
 
 %package: is there one? check to ''cielo''
@@ -32 +20 @@
         package='cielo';
 end
+if ~(strcmpi(package,'cielo') |  ...
+                strcmpi(package,'ice') |  ...
+                strcmpi(package,'macayeal') ),
+        error(['process_solve_options error message: package ' package ' not supported yet!']);
+end
 
-if ~ischar(package), 
-        error(['process_solve_options error message: package ' package ' not supported yet']);
+%analysis_type: check on this option, error out otherwise
+found=0;
+for i=1:size(options,1),
+        if strcmpi(options{i,1},'analysis_type'),
+                analysis_type=options{i,2};
+                found=1;
+        end
+end
+if ~found,
+        error('recover_solve_options error message: no ''analysis_type'' was provided');
 end
 
@@ -69 +70 @@
 end
 
-
 %check solution type is supported
-if ~(   strcmpi(analysis_type,'control') |  ...
-                strcmpi(analysis_type,'diagnostic') |  ...
-                strcmpi(analysis_type,'prognostic') |  ...
-                strcmpi(analysis_type,'thermal') |  ...
-                strcmpi(analysis_type,'parameters') |  ...
-                strcmpi(analysis_type,'mesh') |  ...
-                strcmpi(analysis_type,'mesh2grid') |  ...
-                strcmpi(analysis_type,'transient') ),
+if ~ismemberi(analysis_type,{'control','diagnostic','prognostic','thermal','parameters','mesh2grid','transient'}),
         error(['process_solve_options error message: analysis_type ' analysis_type ' not supported yet!']);
+else
+        %convert to enum
+        analysis_type=eval([upper(analysis_type(1)) lower(analysis_type(2:end)) 'AnalysisEnum']);
 end
-if ~(   strcmpi(sub_analysis_type,'none') |  ...
-                strcmpi(sub_analysis_type,'steady') |  ...
-                strcmpi(sub_analysis_type,'horiz') |  ...
-                strcmpi(sub_analysis_type,'adjoint') |  ...
-                strcmpi(sub_analysis_type,'gradient') |  ...
-                strcmpi(sub_analysis_type,'inverse') |  ...
-                strcmpi(sub_analysis_type,'vert') |  ...
-                strcmpi(sub_analysis_type,'') |  ...
-                strcmpi(sub_analysis_type,'transient') ),
+if ~ismemberi(sub_analysis_type,{'none','steady','horiz','adjoint','gradient','inverse','vert','','transient'}),
         error(['process_solve_options error message: sub_analysis_type ' sub_analysis_type ' not supported yet!']);
+else
+        %convert to enum
+        sub_analysis_type=eval([upper(sub_analysis_type(1)) lower(sub_analysis_type(2:end)) 'AnalysisEnum']);
 end
-if ~(strcmpi(package,'cielo') |  ...
-                strcmpi(package,'ice') |  ...
-                strcmpi(package,'macayeal') ),
-        error(['process_solve_options error message: package ' package ' not supported yet!']);
-end
-
 
 %  process qmu arguments

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

@@ -55 +55 @@
 
 %Launch correct solution sequence
-if strcmpi(md.analysis_type,'diagnostic'),
+if md.analysis_type==DiagnosticAnalysisEnum,
         md=diagnostic(md);
 
-elseif strcmpi(md.analysis_type,'mesh'),
-        md=mesh(md);
-
-elseif strcmpi(md.analysis_type,'transient'),
+elseif md.analysis_type==TransientAnalysisEnum,
         md=transient(md);
 
-elseif strcmpi(md.analysis_type,'mesh2grid'),
+elseif md.analysis_type==Mesh2gridAnalysisEnum,
         md=mesh2grid(md);;
 
-elseif strcmpi(md.analysis_type,'prognostic'),
+elseif md.analysis_type==PrognosticAnalysisEnum,
         md=prognostic(md);;
 
-elseif strcmpi(md.analysis_type,'control'),
+elseif md.analysis_type==ControlAnalysisEnum,
         md=control(md);
 
-elseif strcmpi(md.analysis_type,'thermal'),
+elseif md.analysis_type==ThermalAnalysisEnum,
         md=thermal(md);
 
-elseif strcmpi(md.analysis_type,'parameters'),
+elseif md.analysis_type==ParametersAnalysisEnum,
         md=parameters(md);
 
@@ -100 +97 @@
 addpath(genpath_ice([ISSM_DIR '/src/m/solutions/cielo']));
 addpath(genpath_ice([ISSM_DIR '/bin']));
-