Index: /issm/trunk-jpl/src/m/solve/process_solve_options.m
===================================================================
--- /issm/trunk-jpl/src/m/solve/process_solve_options.m	(revision 17781)
+++ /issm/trunk-jpl/src/m/solve/process_solve_options.m	(revision 17782)
@@ -9,18 +9,11 @@
 %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
Index: /issm/trunk-jpl/src/m/solve/process_solve_options.py
===================================================================
--- /issm/trunk-jpl/src/m/solve/process_solve_options.py	(revision 17781)
+++ /issm/trunk-jpl/src/m/solve/process_solve_options.py	(revision 17782)
@@ -18,16 +18,9 @@
 	#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
Index: /issm/trunk-jpl/src/m/solve/solve.m
===================================================================
--- /issm/trunk-jpl/src/m/solve/solve.m	(revision 17781)
+++ /issm/trunk-jpl/src/m/solve/solve.m	(revision 17782)
@@ -103,12 +103,4 @@
 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),
Index: /issm/trunk-jpl/src/m/solve/solve.py
===================================================================
--- /issm/trunk-jpl/src/m/solve/solve.py	(revision 17781)
+++ /issm/trunk-jpl/src/m/solve/solve.py	(revision 17782)
@@ -96,9 +96,4 @@
 	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: