Changeset 17782

Timestamp:

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

Author:

Mathieu Morlighem

Message:

CHG: simplifying solve options

Location:

issm/trunk-jpl/src/m/solve

Files:

• process_solve_options.m (modified) (1 diff)
• process_solve_options.py (modified) (1 diff)
• solve.m (modified) (1 diff)
• solve.py (modified) (1 diff)

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

@@ -9 +9 @@
 %solution_type: check on this option, error out otherwise
 solution_type=getfieldvalue(options,'solution_type');
-if ~ismember(solution_type,[StressbalanceSolutionEnum(),MasstransportSolutionEnum(),ThermalSolutionEnum(),...
-                SteadystateSolutionEnum(),TransientSolutionEnum(),...
-                BalancethicknessSolutionEnum(),BalancethicknessSoftSolutionEnum(),...
-                BalancevelocitySolutionEnum(),BedSlopeSolutionEnum(),...
-                SurfaceSlopeSolutionEnum(),HydrologySolutionEnum(),FlaimSolutionEnum(),GiaSolutionEnum(),DamageEvolutionSolutionEnum()]),
-        error(['process_solve_options error message: solution_type ' EnumToString(solution_type) ' not supported yet!']);
+if ~strncmp(fliplr(EnumToString(solution_type)),fliplr('Solution'),9),
+        error(['solution_type ' EnumToString(solution_type) ' not supported!']);
 end
 outoptions.solution_type=solution_type;
-
 outoptions.runtimename=getfieldvalue(options,'runtimename',true);
-outoptions.upload=getfieldvalue(options,'upload','off');
 outoptions.batch=getfieldvalue(options,'batch','no');
 outoptions.loadonly=getfieldvalue(options,'loadonly',false);
-outoptions.directory=getfieldvalue(options,'directory','');
 
 %  process qmu arguments

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

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

@@ -103 +103 @@
 LaunchQueueJob(cluster,md.miscellaneous.name,md.private.runtimename,filelist);
 
-%did we even try to run? if so, wait on lock
-if strcmpi(options.upload,'on'),
-        if md.verbose.solution,
-                disp('solve done uploading test decks');
-        end
-        return;
-end
-
 %wait on lock
 if isnan(md.settings.waitonlock),

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

@@ -96 +96 @@
         cluster.LaunchQueueJob(md.miscellaneous.name,md.private.runtimename,filelist)
 
-        #did we even try to run? if so, wait on lock
-        if m.strcmpi(options['upload'],'on'):
-                print 'solve done uploading test decks'
-                return md
-
         #wait on lock
         if md.settings.waitonlock>0: