Changeset 17790 for issm/trunk-jpl/src/m/solve/solve.py

Timestamp:

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

Author:

Mathieu Morlighem

Message:

CHG: removed process_solve_options

File:

• issm/trunk-jpl/src/m/solve/solve.py (modified) (5 diffs)

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
-