Index: ../trunk-jpl/src/m/classes/outputdefinition.py
===================================================================
--- ../trunk-jpl/src/m/classes/outputdefinition.py	(revision 16404)
+++ ../trunk-jpl/src/m/classes/outputdefinition.py	(revision 16405)
@@ -15,7 +15,6 @@
 
 	def __init__(self): # {{{
 		self.definitions                   = []
-		self.enums                         = float('NaN')
 		#}}}
 	def __repr__(self): # {{{
 		string="   Outputdefinitions:"
@@ -36,16 +35,15 @@
 	# }}}
 	def marshall(self,md,fid):    # {{{
 		
-		self.enums=npy.zeros(len(self.definitions),)
+		enums=npy.zeros(len(self.definitions),)
 		
 		for i in range(len(self.definitions)):
 			self.definitions[i].marshall(md,fid);
 			classdefinition=self.definitions[i].__class__.__name__
 			classdefinition=classdefinition[0].upper()+classdefinition[1:]
-			self.enums[i]=StringToEnum(classdefinition)[0]
+			enums[i]=StringToEnum(classdefinition)[0]
 		
-		self.enums=npy.unique(self.enums);
+		enums=npy.unique(enums);
 		
-		WriteData(fid,'object',self,'fieldname','enums','format','DoubleMat','mattype',1)
-
+		WriteData(fid,'data',enums,'enum',OutputdefinitionEnumsEnum(),'format','DoubleMat','mattype',1);
 	# }}}
Index: ../trunk-jpl/src/m/classes/outputdefinition.m
===================================================================
--- ../trunk-jpl/src/m/classes/outputdefinition.m	(revision 16404)
+++ ../trunk-jpl/src/m/classes/outputdefinition.m	(revision 16405)
@@ -7,9 +7,6 @@
 	properties (SetAccess=public) 
 		definitions                 = {};
 	end
-	properties (SetAccess=private) 
-		enums                 = {};
-	end
 	methods
 		function obj = outputdefinition(varargin) % {{{
 			switch nargin
@@ -22,7 +19,6 @@
 		function obj = setdefaultparameters(obj) % {{{
 
 			obj.definitions={};
-			obj.enums=NaN;
 
 		end % }}}
 		function md = checkconsistency(obj,md,solution,analyses) % {{{
@@ -46,11 +42,11 @@
 			obj.definitions{i}.marshall(md,fid);
 			classdefinition=class(obj.definitions{i});
 			classdefinition(1)=upper(classdefinition(1)); %so it matches our enums definitions.
-			obj.enums(i)=StringToEnum(classdefinition);
+			enums(i)=StringToEnum(classdefinition);
 		end
-		obj.enums=unique(obj.enums);
+		enums=unique(enums);
 		
-		WriteData(fid,'object',obj,'fieldname','enums','format','DoubleMat','mattype',1);
+		WriteData(fid,'data',enums,'enum',OutputdefinitionEnumsEnum(),'format','DoubleMat','mattype',1);
 		end % }}}
 	end
 end