Index: sm/trunk-jpl/src/m/modules/EnumToString.m
===================================================================
--- /issm/trunk-jpl/src/m/modules/EnumToString.m	(revision 21143)
+++ 	(revision )
@@ -1,14 +1,0 @@
-function enumstring = EnumToString(enum);
-%ENUMTOSTRING - Convert an enum (int) to a string
-%
-%   Usage:
-%      enumstring = EnumToString(enum);
-
-% Check usage
-if nargin~=1
-	help EnumToString
-	error('Wrong usage (see above)');
-end
-
-% Call mex module
-enumstring = EnumToString_matlab(enum);
Index: sm/trunk-jpl/src/m/modules/EnumToString.py
===================================================================
--- /issm/trunk-jpl/src/m/modules/EnumToString.py	(revision 21143)
+++ 	(revision )
@@ -1,15 +1,0 @@
-from EnumToString_python import EnumToString_python
-
-def EnumToString(enum):
-	"""
-	ENUMTOSTRING - Convert an enum (int) to a string
-
-		Usage:
-			enumstring = EnumToString(enum)
-	"""
-
-	# Call mex module
-	enumstring = EnumToString_python(enum)
-
-	# Return
-	return enumstring
Index: sm/trunk-jpl/src/m/modules/StringToEnum.m
===================================================================
--- /issm/trunk-jpl/src/m/modules/StringToEnum.m	(revision 21143)
+++ 	(revision )
@@ -1,14 +1,0 @@
-function enum = StringToEnum(string);
-%STRINGTOENUM - Convert a string to an enum (int)
-%
-%   Usage:
-%      enum = StringToEnum(string);
-
-% Check usage
-if nargin~=1
-	help StringToEnum
-	error('Wrong usage (see above)');
-end
-
-% Call mex module
-enum = StringToEnum_matlab(string);
Index: sm/trunk-jpl/src/m/modules/StringToEnum.py
===================================================================
--- /issm/trunk-jpl/src/m/modules/StringToEnum.py	(revision 21143)
+++ 	(revision )
@@ -1,14 +1,0 @@
-from StringToEnum_python import StringToEnum_python
-
-def StringToEnum(string):
-	"""
-	STRINGTOENUM - Convert a string to an enum (int)
-
-	   Usage:
-		   enum = StringToEnum(string);
-	"""
-	
-	# Call mex module
-	enum = StringToEnum_python(string)
-	# Return
-	return enum
Index: /issm/trunk-jpl/src/m/solve/WriteData.m
===================================================================
--- /issm/trunk-jpl/src/m/solve/WriteData.m	(revision 21143)
+++ /issm/trunk-jpl/src/m/solve/WriteData.m	(revision 21144)
@@ -52,5 +52,5 @@
 %Step 2: write the data itself.
 if     strcmpi(format,'Boolean'),% {{{
-	if(numel(data)~=1), error(['field ' EnumToString(enum) ' cannot be marshalled as it has more than one element!']); end
+	if(numel(data)~=1), error(['field ' name ' cannot be marshalled as it has more than one element!']); end
 
 	%first write length of record
@@ -64,5 +64,5 @@
 	% }}}
 elseif strcmpi(format,'Integer'), % {{{
-	if(numel(data)~=1), error(['field ' EnumToString(enum) ' cannot be marshalled as it has more than one element!']); end
+	if(numel(data)~=1), error(['field ' name ' cannot be marshalled as it has more than one element!']); end
 
 	%first write length of record
@@ -76,5 +76,5 @@
 	% }}}
 elseif strcmpi(format,'Double'), % {{{
-	if(numel(data)~=1), error(['field ' EnumToString(enum) ' cannot be marshalled as it has more than one element!']); end
+	if(numel(data)~=1), error(['field ' name ' cannot be marshalled as it has more than one element!']); end
 
 	%first write length of record
@@ -155,5 +155,5 @@
 	%first write length of record
 	recordlength=4+4+8*s(1)*s(2)+4+4; %2 integers (32 bits) + the double matrix + code + matrix type
-	if recordlength>2^31; error(['field ' EnumToString(enum) ' cannot be marshalled because it is larger than 2^31 bytes!']); end
+	if recordlength>2^31; error(['field ' name ' cannot be marshalled because it is larger than 2^31 bytes!']); end
 	fwrite(fid,recordlength,'int');
 
@@ -232,5 +232,5 @@
 	% }}}
 else  % {{{
-	error(['WriteData error message: data type: ' num2str(format) ' not supported yet! (' EnumToString(enum) ')']);
+	error(['WriteData error message: data type: ' num2str(format) ' not supported yet! (' name ')']);
 end % }}}
 end
Index: /issm/trunk-jpl/src/m/solve/WriteData.py
===================================================================
--- /issm/trunk-jpl/src/m/solve/WriteData.py	(revision 21143)
+++ /issm/trunk-jpl/src/m/solve/WriteData.py	(revision 21144)
@@ -64,5 +64,5 @@
 	if   m.strcmpi(format,'Boolean'):    # {{{
 #		if len(data) !=1:
-#			raise ValueError('field %s cannot be marshalled as it has more than one element!' % EnumToString(enum)[0])
+#			raise ValueError('field %s cannot be marshalled as it has more than one element!' % name[0])
 
 		#first write length of record
@@ -78,5 +78,5 @@
 	elif m.strcmpi(format,'Integer'):    # {{{
 #		if len(data) !=1:
-#			raise ValueError('field %s cannot be marshalled as it has more than one element!' % EnumToString(enum)[0])
+#			raise ValueError('field %s cannot be marshalled as it has more than one element!' % name[0])
 
 		#first write length of record
@@ -92,5 +92,5 @@
 	elif m.strcmpi(format,'Double'):    # {{{
 #		if len(data) !=1:
-#			raise ValueError('field %s cannot be marshalled as it has more than one element!' % EnumToString(enum)[0])
+#			raise ValueError('field %s cannot be marshalled as it has more than one element!' % name[0])
 
 		#first write length of record