Changeset 8296

Timestamp:

05/16/11 13:10:11 (14 years ago)

Author:

Mathieu Morlighem

Message:

no need to provide analysis_type in solve command anymore

Location:

issm/trunk/src/m/model

Files:

• process_solve_options.m (modified) (3 diffs)
• solve.m (modified) (2 diffs)

issm/trunk/src/m/model/process_solve_options.m

@@ -8 +8 @@
 
 %solution_type: check on this option, error out otherwise
-solution_type=getfieldvalue(options,'analysis_type');
-
-%batch mode for launching jobs.
-outoptions.batch=getfieldvalue(options,'batch','no');
-
-%directory 
-outoptions.directory=getfieldvalue(options,'directory','');
-
-%convert to Enum if a string was provided
+solution_type=getfieldvalue(options,'solution_type');
 if ischar(solution_type), error(['only Enums are supported as ''solution_type''. For example: md=solve(md,''solution_type'',DiagnosticSolutionEnum); ']); end
-
-%check solution type is supported
 if ~ismember(solution_type,[DiagnosticSolutionEnum,PrognosticSolutionEnum,ThermalSolutionEnum,...
                 SteadystateSolutionEnum,ParametersSolutionEnum,Transient2DSolutionEnum,Transient3DSolutionEnum...
@@ -26 +16 @@
 end
 outoptions.solution_type=solution_type;
+
 outoptions.upload=getfieldvalue(options,'upload','off');
+outoptions.batch=getfieldvalue(options,'batch','no');
+outoptions.directory=getfieldvalue(options,'directory','');
 
 %  process qmu arguments
@@ -46 +39 @@
 outoptions.latsgn=getfieldvalue(options,'latsgn',0);
 outoptions.cmap=getfieldvalue(options,'cmap',[]);
-

issm/trunk/src/m/model/solve.m

@@ -1 @@
-function md=solve(md,varargin)
+function md=solve(md,solutionenum,varargin)
 %SOLVE - apply solution sequence for this model
 %
 %   Usage:
-%      md=solve(md,varargin)
+%      md=solve(md,solutionenum,varargin)
 %      where varargin is a lit of paired arguments of string OR enums
-%      arguments can be: 'analysis_type': 'DiagnosticAnalysis','ThermalAnalysis','PrognosticAnalysis','Transient2DAnalysis'
 %
 %   Examples:
-%      md=solve(md,'analysis_type',DiagnosticSolutionEnum);
+%      md=solve(md,DiagnosticSolutionEnum);
 
 %recover options
-options=pairoptions(varargin{:});
+options=pairoptions(varargin{:},'solution_type',solutionenum);
 
 %add default options
@@ -62 +61 @@
 
 %Check result is consistent
-disp('checking result consistency');
+%disp('checking result consistency');
 %if ~isresultconsistent(md,options.solution_type),
 %       disp('!! results not consistent correct the model !!') %it would be very cruel to put an error, it would kill the computed results (even if not consistent...)