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

Timestamp:

04/20/14 09:20:23 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: simplifying solve options

File:

• issm/trunk-jpl/src/m/solve/process_solve_options.py (modified) (1 diff)

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

@@ -18 +18 @@
         #solution_type: check on this option, error out otherwise
         solution_type=options.getfieldvalue('solution_type')
-        if solution_type not in (StressbalanceSolutionEnum(),MasstransportSolutionEnum(),ThermalSolutionEnum(),\
-                        SteadystateSolutionEnum(),TransientSolutionEnum(),\
-                        BalancethicknessSolutionEnum(),BalancevelocitySolutionEnum(),\
-                        BedSlopeSolutionEnum(),SurfaceSlopeSolutionEnum(),\
-                        HydrologySolutionEnum(),FlaimSolutionEnum(),GiaSolutionEnum(),DamageEvolutionSolutionEnum()):
-                raise ValueError("process_solve_options error message: solution_type '%s' not supported yet!" % EnumToString(solution_type)[0])
+        if EnumToString(solution_type)[0][-8:] != 'Solution':
+                raise ValueError("solution_type '%s' not supported!" % EnumToString(solution_type)[0])
         outoptions['solution_type']=solution_type
-
-        outoptions['upload']=options.getfieldvalue('upload','off')
         outoptions['batch']=options.getfieldvalue('batch','no')
         outoptions['loadonly']=options.getfieldvalue('loadonly',False)
-        outoptions['directory']=options.getfieldvalue('directory','')
 
         #  process qmu arguments