Index: /issm/trunk-jpl/src/m/boundaryconditions/love_numbers.py
===================================================================
--- /issm/trunk-jpl/src/m/boundaryconditions/love_numbers.py	(revision 21068)
+++ /issm/trunk-jpl/src/m/boundaryconditions/love_numbers.py	(revision 21069)
@@ -1,5 +1,4 @@
 from MatlabFuncs import *
 from model import *
-from EnumDefinitions import *
 from numpy import *
 
Index: /issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.py
===================================================================
--- /issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.py	(revision 21068)
+++ /issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.py	(revision 21069)
@@ -1,5 +1,2 @@
-from EnumDefinitions import *
-from EnumToString import EnumToString
-
 def AnalysisConfiguration(solutiontype): #{{{
 	"""
Index: /issm/trunk-jpl/src/m/coordsystems/gmtmask.py
===================================================================
--- /issm/trunk-jpl/src/m/coordsystems/gmtmask.py	(revision 21068)
+++ /issm/trunk-jpl/src/m/coordsystems/gmtmask.py	(revision 21069)
@@ -1,5 +1,4 @@
 from MatlabFuncs import *
 from model import *
-from EnumDefinitions import *
 from numpy import *
 from os import getenv, putenv
Index: /issm/trunk-jpl/src/m/mesh/planet/gmsh/gmshplanet.py
===================================================================
--- /issm/trunk-jpl/src/m/mesh/planet/gmsh/gmshplanet.py	(revision 21068)
+++ /issm/trunk-jpl/src/m/mesh/planet/gmsh/gmshplanet.py	(revision 21069)
@@ -1,5 +1,4 @@
 from MatlabFuncs import *
 from model import *
-from EnumDefinitions import *
 from numpy import *
 from pairoptions import *
Index: /issm/trunk-jpl/src/m/miscellaneous/issmdoc.m
===================================================================
--- /issm/trunk-jpl/src/m/miscellaneous/issmdoc.m	(revision 21068)
+++ /issm/trunk-jpl/src/m/miscellaneous/issmdoc.m	(revision 21069)
@@ -12,4 +12,4 @@
 disp(sprintf('%-63s %s','       md=parameterize(md,''Square.par'');','%fills all the other fields of the model'));
 disp(sprintf('%-63s %s','       md=setflowequation(md,''SSA'',''all'');','%defines all elements as SSA''s SSA'));
-disp(sprintf('%-63s %s','       md=solve(md,StressbalanceSolutionEnum());','%solve for stress balance'));
+disp(sprintf('%-63s %s','       md=solve(md,''Stressbalance'');','%solve for stress balance'));
 disp(sprintf('%-63s %s','       plotmodel(md,''data'',md.results.StressbalanceSolution.Vel);','%displays the velocity (type plotdoc for plotmodel help)'));
Index: /issm/trunk-jpl/src/m/solve/WriteData.py
===================================================================
--- /issm/trunk-jpl/src/m/solve/WriteData.py	(revision 21068)
+++ /issm/trunk-jpl/src/m/solve/WriteData.py	(revision 21069)
@@ -4,6 +4,4 @@
 import pairoptions
 import MatlabFuncs as m
-from EnumDefinitions import *
-from EnumToString import EnumToString
 
 def WriteData(fid,prefix,*args):
Index: /issm/trunk-jpl/src/m/solve/loadresultsfromdisk.m
===================================================================
--- /issm/trunk-jpl/src/m/solve/loadresultsfromdisk.m	(revision 21068)
+++ /issm/trunk-jpl/src/m/solve/loadresultsfromdisk.m	(revision 21069)
@@ -59,8 +59,4 @@
 %post processes qmu results if necessary
 else
-
-	if isscalar(md.private.solution),
-		md.private.solution=EnumToString(md.private.solution);
-	end
 	md=postqmu(md);
 	cd ..
Index: /issm/trunk-jpl/src/m/solve/loadresultsfromdisk.py
===================================================================
--- /issm/trunk-jpl/src/m/solve/loadresultsfromdisk.py	(revision 21068)
+++ /issm/trunk-jpl/src/m/solve/loadresultsfromdisk.py	(revision 21069)
@@ -2,5 +2,4 @@
 from results import results
 from parseresultsfromdisk import parseresultsfromdisk
-from EnumToString import EnumToString
 import MatlabFuncs as m
 
@@ -58,10 +57,6 @@
 	#post processes qmu results if necessary
 	else:
-
-		if not isinstance(md.private.solution,(str,unicode)):
-			md.private.solution=EnumToString(md.private.solution)[0]
 		md=postqmu(md)
 		os.chdir('..')
 
 	return md
-
Index: /issm/trunk-jpl/src/m/solve/marshall.py
===================================================================
--- /issm/trunk-jpl/src/m/solve/marshall.py	(revision 21068)
+++ /issm/trunk-jpl/src/m/solve/marshall.py	(revision 21069)
@@ -1,4 +1,3 @@
 from WriteData import WriteData
-from EnumDefinitions import *
 
 def marshall(md):
Index: /issm/trunk-jpl/src/m/solve/solve.js
===================================================================
--- /issm/trunk-jpl/src/m/solve/solve.js	(revision 21068)
+++ /issm/trunk-jpl/src/m/solve/solve.js	(revision 21069)
@@ -70,8 +70,8 @@
 	var args = Array.prototype.slice.call(arguments);
 	var options = new pairoptions(args.slice(2,args.length));
-	options.addfield('solutionenum',solutionenum);
+	options.addfield('solutionstring',solutionstring);
 
 	//recover some fields
-	md.priv.solution=solutionenum;
+	md.priv.solution=solutionstring;
 	cluster=md.cluster;
 
@@ -83,6 +83,6 @@
 		if (solutionstring === 'FlaimSolution'){
 			md.priv.isconsistent=true;
-			md.mesh.checkconsistency(md,solutionenum);
-			md.flaim.checkconsistency(md,solutionenum);
+			md.mesh.checkconsistency(md,solutionstring);
+			md.flaim.checkconsistency(md,solutionstring);
 			if (md.priv.isconsistent==false){
 				throw error('solve error message: model not consistent, see messages above');
Index: /issm/trunk-jpl/src/m/solve/solve.py
===================================================================
--- /issm/trunk-jpl/src/m/solve/solve.py	(revision 21068)
+++ /issm/trunk-jpl/src/m/solve/solve.py	(revision 21069)
@@ -3,6 +3,4 @@
 import shutil
 from pairoptions import pairoptions
-from EnumDefinitions import *
-from EnumToString import EnumToString
 from ismodelselfconsistent import ismodelselfconsistent
 from marshall import marshall
Index: /issm/trunk-jpl/src/m/solve/solveslm.m
===================================================================
--- /issm/trunk-jpl/src/m/solve/solveslm.m	(revision 21068)
+++ /issm/trunk-jpl/src/m/solve/solveslm.m	(revision 21069)
@@ -1,23 +1,23 @@
-function slm=solveslm(slm,solutionenum,varargin)
+function slm=solveslm(slm,solutionstring,varargin)
 %SOLVESLR - apply solution sequence for this sealevel model
 %
 %   Usage:
-%      slm=solve(slm,solutionenum,varargin)
+%      slm=solve(slm,solutionstring,varargin)
 %      where varargin is a lit of paired arguments of string OR enums
 %
 %   solution types available comprise:
-%		 - SealevelriseSolutionEnum
-%		 - TransientSolutionEnum
+%		 - 'Sealevelrise'
+%		 - 'Transient'
 %
 %  extra options:
 %
 %   Examples:
-%      slm=solve(slm,TransientSolutionEnum);
+%      slm=solve(slm,'Transient');
 
 %first check consistency: 
-slm.checkconsistency(solutionenum);
+slm.checkconsistency(solutionstring);
 
 %process options:: 
-options=pairoptions(varargin{:},'solutionenum',solutionenum);
+options=pairoptions(varargin{:},'solutionstring',solutionstring);
 
 %figure out if the sum of cluster processors requested sums up correctly: 
@@ -30,5 +30,5 @@
 
 %recover some fields
-slm.private.solution=solutionenum;
+slm.private.solution=solutionstring;
 cluster=slm.cluster;
 batch=0;
@@ -36,7 +36,7 @@
 %now, go through icecaps, glacies and earth, and upload all the data independently: 
 for i=1:length(slm.icecaps),
-	slm.icecaps{i}=solve(slm.icecaps{i},solutionenum,'batch','yes');
+	slm.icecaps{i}=solve(slm.icecaps{i},solutionstring,'batch','yes');
 end
-slm.earth=solve(slm.earth,solutionenum,'batch','yes');
+slm.earth=solve(slm.earth,solutionstring,'batch','yes');
 
 %Firs, build a runtime name that is unique