Changeset 486

Timestamp:

05/19/09 12:02:09 (16 years ago)

Author:

Mathieu Morlighem

Message:

Added package check

Location:

issm/trunk/src/m/classes/public

Files:

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

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
@@ -63 +60 @@
         error(['process_solve_options error message: analysis_type ' analysis_type ' not supported yet!']);
 end
-
 if ~(strcmpi(sub_analysis_type,'') |  ...
-        strcmpi(sub_analysis_type,'steady_state') |  ...
+        strcmpi(sub_analysis_type,'steady') |  ...
         strcmpi(sub_analysis_type,'horiz') |  ...
         strcmpi(sub_analysis_type,'vert') |  ...
@@ -71 +67 @@
         error(['process_solve_options error message: sub_analysis_type ' sub_analysis_type ' not supported yet!']);
 end
-
-
+if ~(strcmpi(sub_analysis_type,'cielo') |  ...
+                strcmpi(sub_analysis_type,'ice') |  ...
+                strcmpi(sub_analysis_type,'macayeal') ),
+        error(['process_solve_options error message: package ' package ' not supported yet!']);
+end
 
 %setup final options structure

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

@@ -3 +3 @@
 %
 %   Usage:
-%       md=solve(md,varargin)
-%       where varargin is a lit of paired arguments. 
-%       arguments can be: 'analysis_type': 'diagnostic','thermal','prognostic','transient'
-%       arguments can be: 'sub_analysis_type': 'transient',''
-%       arguments can be: 'package': 'macayeal','ice','cielo'
+%      md=solve(md,varargin)
+%      where varargin is a lit of paired arguments. 
+%      arguments can be: 'analysis_type': 'diagnostic','thermal','prognostic','transient'
+%      arguments can be: 'sub_analysis_type': 'transient','steady','' (default if empty = 'steady')
+%      arguments can be: 'package': 'macayeal','ice','cielo' (default if not specified = 'cielo')
 %
 %   Examples:
@@ -13 +13 @@
 %      md=solve(md,'analysis_type','control','package','ice');
 %      md=solve(md,'analysis_type','thermal','sub_analysis_type','transient','package','ice');
-%      md=solve(md,'analysis_type','thermal','sub_analysis_type','','package','cielo');
+%      md=solve(md,'analysis_type','thermal','sub_analysis_type','steady','package','cielo');
+%      md=solve(md,'analysis_type','thermal','package','cielo');
 
 %some checks on list of arguments
@@ -38 +39 @@
 displaystring(md.debug,'\n%s\n','launching solution sequence');
 
-
 %If running in parallel, we have a different way of launching the solution
 %sequences. qmu is the only solution sequence that cannot run in parallel
@@ -48 +48 @@
 end
 
-%Lauch correct solution sequence
+%Launch correct solution sequence
 if strcmpi(md.analysis_type,'diagnostic'),
         md=diagnostic(md);
@@ -87 +87 @@
 addpath(genpath_ice([ISSM_DIR '/src/m/solutions/cielo']));
 addpath(genpath_ice([ISSM_DIR '/bin']));
-
-function solveusage();
-disp(' ');
-disp('   Solve usage: md=solve(md,md.analysis_type,package)');
-disp('         md.analysis_type can be ''diagnostic'',''transient'', ''thermal'',''thermaltransient'',''parameters'',''mesh2grid''  or ''control''');
-disp('         package is either ''cielo'' or ''ice''');