Changeset 17790

Timestamp:

04/21/14 15:33:50 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: removed process_solve_options

Location:

issm/trunk-jpl/src/m/solve

Files:

• process_solve_options.m (deleted)
• process_solve_options.py (deleted)
• solve.m (modified) (5 diffs)
• solve.py (modified) (5 diffs)

issm/trunk-jpl/src/m/solve/solve.m

@@ -11 +11 @@
 %                - ThermalSolutionEnum
 %                - SteadystateSolutionEnum
-%                - TransientSolutionEnum...
+%                - TransientSolutionEnum
 %                - BalancethicknessSolutionEnum
 %                - BedSlopeSolutionEnum
@@ -26 +26 @@
 
 %recover and process solve options
-options=pairoptions(varargin{:},'solution_type',solutionenum);
-options=process_solve_options(options);
+if ~strncmp(fliplr(EnumToString(solutionenum)),fliplr('Solution'),8),
+        error(['solutionenum ' EnumToString(solutionenum) ' not supported!']);
+end
+options=pairoptions(varargin{:},'solutionenum',solutionenum);
 
 %recover some fields
-md.private.solution=options.solution_type;
+md.private.solution=solutionenum;
 cluster=md.cluster;
 
@@ -49 +51 @@
 
 %First, build a runtime name that is unique
-if options.runtimename,
+if getfieldvalue(options,'runtimename',true),
         c=clock;
         md.private.runtimename=sprintf('%s-%02i-%02i-%04i-%02i-%02i-%02i-%i',md.miscellaneous.name,c(2),c(3),c(1),c(4),c(5),floor(c(6)),feature('GetPid'));
@@ -62 +64 @@
 end
 
-%flaim analysis
-if (options.solution_type == FlaimSolutionEnum())
+%flaim analysis (To be removed?)
+if (solutionenum == FlaimSolutionEnum())
+        %fmdir     = getfieldvalue(options,'fmdir',['fm' num2str(feature('GetPid'))]);
+        %overwrite = getfieldvalue(options,'overwrite','n');
+        %keep      = getfieldvalue(options,'keep','y');
+        %latsgn    = getfieldvalue(options,'latsgn',0);
+        %cmap      = getfieldvalue(options,'cmap',[]);
         md=flaim_sol(md,options);
-        md.private.solution=EnumToString(options.solution_type);
+        md.private.solution=EnumToString(solutionenum);
         return;
 end
 
 %Do we load results only?
-if options.loadonly,  
+if getfieldvalue(options,'loadonly',false),
         md=loadresultsfromcluster(md);
         return;
@@ -81 +88 @@
 
 %Stop here if batch mode
-if strcmpi(options.batch,'yes')
+if strcmpi(getfieldvalue(options,'batch','no'),'yes')
         if md.verbose.solution,
                 disp('batch mode requested: not launching job interactively');

issm/trunk-jpl/src/m/solve/solve.py

@@ -25 +25 @@
               - ThermalSolutionEnum
               - SteadystateSolutionEnum
-              - TransientSolutionEnum...
+              - TransientSolutionEnum
               - BalancethicknessSolutionEnum
               - BedSlopeSolutionEnum
@@ -40 +40 @@
 
         #recover and process solve options
-        options=pairoptions('solution_type',solutionenum,*args)
-        options=process_solve_options(options)
+        if EnumToString(solutionenum)[0][-8:] != 'Solution':
+                raise ValueError("solutionenum '%s' not supported!" % EnumToString(solutionenum)[0])
+        options=pairoptions('solutionenum',solutionenum,*args)
 
         #recover some fields
-        md.private.solution=options['solution_type']
+        md.private.solution=solutionenum
         cluster=md.cluster
 
@@ -68 +69 @@
 
         #flaim analysis
-        if options['solution_type'] == FlaimSolutionEnum():
+        if solutionenum == FlaimSolutionEnum():
                 md=flaim_sol(md,options)
-                [md.private.solution]=EnumToString(options['solution_type'])
+                [md.private.solution]=EnumToString(solutionenum)
                 return md
 
         #Do we load results only?
-        if options['loadonly']:  
+        if options.getfieldvalue('loadonly',False):
                 md=loadresultsfromcluster(md)
                 return md
@@ -84 +85 @@
 
         #Stop here if batch mode
-        if m.strcmpi(options['batch'],'yes'):
+        if m.strcmpi(options.getfieldvalue('batch','no'),'yes'):
                 print 'batch mode requested: not launching job interactively'
                 print 'launch solution sequence on remote cluster by hand'
@@ -112 +113 @@
 
         return md
-