Index: /issm/trunk-jpl/src/m/classes/autodiff.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/autodiff.m	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/autodiff.m	(revision 15131)
@@ -49,5 +49,5 @@
 			fielddisplay(obj,'driver','ADOLC driver (''fos_forward'' or ''fov_forward'')');
 		end % }}}
-		function marshall(obj,fid) % {{{
+		function marshall(obj,md,fid) % {{{
 
 			WriteData(fid,'object',obj,'fieldname','isautodiff','format','Boolean');
Index: /issm/trunk-jpl/src/m/classes/autodiff.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/autodiff.py	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/autodiff.py	(revision 15131)
@@ -56,5 +56,5 @@
 		return md
 	# }}}
-	def marshall(self,fid):    # {{{
+	def marshall(self,md,fid):    # {{{
 		WriteData(fid,'object',self,'fieldname','isautodiff','format','Boolean')
 		WriteData(fid,'object',self,'fieldname','driver','format','String')
Index: /issm/trunk-jpl/src/m/classes/balancethickness.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/balancethickness.m	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/balancethickness.m	(revision 15131)
@@ -41,5 +41,5 @@
 
 		end % }}}
-		function marshall(obj,fid) % {{{
+		function marshall(obj,md,fid) % {{{
 
 			yts=365.0*24.0*3600.0;
Index: /issm/trunk-jpl/src/m/classes/balancethickness.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/balancethickness.py	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/balancethickness.py	(revision 15131)
@@ -48,5 +48,5 @@
 		return md
 	# }}}
-	def marshall(self,fid):    # {{{
+	def marshall(self,md,fid):    # {{{
 
 		yts=365.0*24.0*3600.0
Index: /issm/trunk-jpl/src/m/classes/basalforcings.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/basalforcings.m	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/basalforcings.m	(revision 15131)
@@ -43,5 +43,5 @@
 
 		end % }}}
-		function marshall(obj,fid) % {{{
+		function marshall(obj,md,fid) % {{{
 
 			yts=365.0*24.0*3600.0;
Index: /issm/trunk-jpl/src/m/classes/basalforcings.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/basalforcings.py	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/basalforcings.py	(revision 15131)
@@ -46,5 +46,5 @@
 		return md
 	# }}}
-	def marshall(self,fid):    # {{{
+	def marshall(self,md,fid):    # {{{
 
 		yts=365.0*24.0*3600.0
Index: /issm/trunk-jpl/src/m/classes/constants.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/constants.m	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/constants.m	(revision 15131)
@@ -46,5 +46,5 @@
 
 		end % }}}
-		function marshall(obj,fid) % {{{
+		function marshall(obj,md,fid) % {{{
 			WriteData(fid,'object',obj,'fieldname','g','format','Double');
 			WriteData(fid,'object',obj,'fieldname','yts','format','Double');
Index: /issm/trunk-jpl/src/m/classes/constants.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/constants.py	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/constants.py	(revision 15131)
@@ -51,5 +51,5 @@
 		return md
 	# }}}
-	def marshall(self,fid):    # {{{
+	def marshall(self,md,fid):    # {{{
 		WriteData(fid,'object',self,'fieldname','g','format','Double')
 		WriteData(fid,'object',self,'fieldname','yts','format','Double')
Index: /issm/trunk-jpl/src/m/classes/debug.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/debug.m	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/debug.m	(revision 15131)
@@ -30,5 +30,5 @@
 
 		end % }}}
-		function marshall(obj,fid) % {{{
+		function marshall(obj,md,fid) % {{{
 			WriteData(fid,'object',obj,'fieldname','profiling','format','Boolean');
 		end % }}}
Index: /issm/trunk-jpl/src/m/classes/debug.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/debug.py	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/debug.py	(revision 15131)
@@ -30,5 +30,5 @@
 		return self
 	#}}}
-	def marshall(self,fid):    # {{{
+	def marshall(self,md,fid):    # {{{
 		WriteData(fid,'object',self,'fieldname','profiling','format','Boolean')
 	# }}}
Index: /issm/trunk-jpl/src/m/classes/diagnostic.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/diagnostic.m	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/diagnostic.m	(revision 15131)
@@ -150,5 +150,5 @@
 
 		end % }}}
-		function marshall(obj,fid) % {{{
+		function marshall(obj,md,fid) % {{{
 			WriteData(fid,'object',obj,'fieldname','spcvx','format','DoubleMat','mattype',1);
 			WriteData(fid,'object',obj,'fieldname','spcvy','format','DoubleMat','mattype',1);
Index: /issm/trunk-jpl/src/m/classes/diagnostic.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/diagnostic.py	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/diagnostic.py	(revision 15131)
@@ -160,5 +160,5 @@
 		return md
 	# }}}
-	def marshall(self,fid):    # {{{
+	def marshall(self,md,fid):    # {{{
 		WriteData(fid,'object',self,'fieldname','spcvx','format','DoubleMat','mattype',1)
 		WriteData(fid,'object',self,'fieldname','spcvy','format','DoubleMat','mattype',1)
Index: /issm/trunk-jpl/src/m/classes/flowequation.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/flowequation.m	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/flowequation.m	(revision 15131)
@@ -73,5 +73,5 @@
 
 		end % }}}
-		function marshall(obj,fid) % {{{
+		function marshall(obj,md,fid) % {{{
 			WriteData(fid,'object',obj,'fieldname','ismacayealpattyn','format','Boolean');
 			WriteData(fid,'object',obj,'fieldname','ishutter','format','Boolean');
Index: /issm/trunk-jpl/src/m/classes/flowequation.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/flowequation.py	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/flowequation.py	(revision 15131)
@@ -73,5 +73,5 @@
 		return md
 	# }}}
-	def marshall(self,fid):    # {{{
+	def marshall(self,md,fid):    # {{{
 		WriteData(fid,'object',self,'fieldname','ismacayealpattyn','format','Boolean')
 		WriteData(fid,'object',self,'fieldname','ishutter','format','Boolean')
Index: /issm/trunk-jpl/src/m/classes/friction.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/friction.m	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/friction.m	(revision 15131)
@@ -37,5 +37,5 @@
 			fielddisplay(obj,'q','q exponent');
 		end % }}}
-		function marshall(obj,fid) % {{{
+		function marshall(obj,md,fid) % {{{
 			WriteData(fid,'object',obj,'fieldname','coefficient','format','DoubleMat','mattype',1);
 			WriteData(fid,'object',obj,'fieldname','p','format','DoubleMat','mattype',2);
Index: /issm/trunk-jpl/src/m/classes/friction.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/friction.py	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/friction.py	(revision 15131)
@@ -44,5 +44,5 @@
 		return md
 	# }}}
-	def marshall(self,fid):    # {{{
+	def marshall(self,md,fid):    # {{{
 		WriteData(fid,'object',self,'fieldname','coefficient','format','DoubleMat','mattype',1)
 		WriteData(fid,'object',self,'fieldname','p','format','DoubleMat','mattype',2)
Index: /issm/trunk-jpl/src/m/classes/geometry.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/geometry.m	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/geometry.m	(revision 15131)
@@ -50,5 +50,5 @@
 
 		end % }}}
-		function marshall(obj,fid) % {{{
+		function marshall(obj,md,fid) % {{{
 			WriteData(fid,'data',obj.surface,'format','DoubleMat','mattype',1,'enum',SurfaceEnum());
 			WriteData(fid,'data',obj.thickness,'format','DoubleMat','mattype',1,'enum',ThicknessEnum());
Index: /issm/trunk-jpl/src/m/classes/geometry.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/geometry.py	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/geometry.py	(revision 15131)
@@ -48,5 +48,5 @@
 		return md
 	# }}}
-	def marshall(self,fid):    # {{{
+	def marshall(self,md,fid):    # {{{
 		WriteData(fid,'data',self.surface,'format','DoubleMat','mattype',1,'enum',SurfaceEnum())
 		WriteData(fid,'data',self.thickness,'format','DoubleMat','mattype',1,'enum',ThicknessEnum())
Index: /issm/trunk-jpl/src/m/classes/gia.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/gia.m	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/gia.m	(revision 15131)
@@ -57,5 +57,5 @@
 
 		end % }}}
-		function marshall(obj,fid) % {{{
+		function marshall(obj,md,fid) % {{{
 			WriteData(fid,'object',obj,'fieldname','mantle_viscosity','format','DoubleMat','mattype',1);
 			WriteData(fid,'object',obj,'fieldname','lithosphere_thickness','format','DoubleMat','mattype',1,'scale',10^3); %from km to m
Index: /issm/trunk-jpl/src/m/classes/gia.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/gia.py	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/gia.py	(revision 15131)
@@ -55,5 +55,5 @@
 		return md
 	# }}}
-	def marshall(self,fid):    # {{{
+	def marshall(self,md,fid):    # {{{
 
 		WriteData(fid,'object',self,'fieldname','mantle_viscosity','format','DoubleMat','mattype',1);
Index: /issm/trunk-jpl/src/m/classes/groundingline.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/groundingline.m	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/groundingline.m	(revision 15131)
@@ -52,5 +52,5 @@
 
 		end % }}}
-		function marshall(obj,fid) % {{{
+		function marshall(obj,md,fid) % {{{
 			WriteData(fid,'data',StringToEnum(obj.migration),'enum',GroundinglineMigrationEnum(),'format','Integer');
 			WriteData(fid,'object',obj,'fieldname','melting_rate','format','Double');
Index: /issm/trunk-jpl/src/m/classes/groundingline.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/groundingline.py	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/groundingline.py	(revision 15131)
@@ -56,5 +56,5 @@
 		return md
 	# }}}
-	def marshall(self,fid):    # {{{
+	def marshall(self,md,fid):    # {{{
 		WriteData(fid,'data',StringToEnum(self.migration)[0],'enum',GroundinglineMigrationEnum(),'format','Integer')
 		WriteData(fid,'object',self,'fieldname','melting_rate','format','Double')
Index: /issm/trunk-jpl/src/m/classes/hydrologydc.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/hydrologydc.m	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/hydrologydc.m	(revision 15131)
@@ -132,5 +132,5 @@
 
 		end % }}}
-		function marshall(obj,fid) % {{{ 
+		function marshall(obj,md,fid) % {{{ 
 			WriteData(fid,'enum',HydrologyModelEnum(),'data',HydrologydcEnum(),'format','Integer');	
 			WriteData(fid,'object',obj,'fieldname','water_compressibility','format','Double');
Index: /issm/trunk-jpl/src/m/classes/hydrologyshreve.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/hydrologyshreve.m	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/hydrologyshreve.m	(revision 15131)
@@ -59,5 +59,5 @@
 
 		end % }}}
-		function marshall(obj,fid) % {{{
+		function marshall(obj,md,fid) % {{{
 			WriteData(fid,'enum',HydrologyModelEnum(),'data',HydrologyshreveEnum(),'format','Integer');
 			WriteData(fid,'object',obj,'fieldname','spcwatercolumn','format','DoubleMat','mattype',1);
Index: /issm/trunk-jpl/src/m/classes/hydrologyshreve.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/hydrologyshreve.py	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/hydrologyshreve.py	(revision 15131)
@@ -62,5 +62,5 @@
 		return md
 	# }}}
-	def marshall(self,fid):    # {{{
+	def marshall(self,md,fid):    # {{{
 		WriteData(fid,'enum',HydrologyModelEnum(),'data',HydrologyshreveEnum(),'format','Integer');
 		WriteData(fid,'object',self,'fieldname','spcwatercolumn','format','DoubleMat','mattype',1)
Index: /issm/trunk-jpl/src/m/classes/initialization.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/initialization.m	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/initialization.m	(revision 15131)
@@ -90,5 +90,5 @@
 
 		end % }}}
-		function marshall(obj,fid) % {{{
+		function marshall(obj,md,fid) % {{{
 
 			yts=365.0*24.0*3600.0;
Index: /issm/trunk-jpl/src/m/classes/initialization.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/initialization.py	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/initialization.py	(revision 15131)
@@ -73,5 +73,5 @@
 		return md
 	# }}}
-	def marshall(self,fid):    # {{{
+	def marshall(self,md,fid):    # {{{
 
 		yts=365.0*24.0*3600.0
Index: /issm/trunk-jpl/src/m/classes/inversion.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/inversion.m	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/inversion.m	(revision 15131)
@@ -161,5 +161,5 @@
 			disp('   503: ThicknessAbsGradient');
 		end % }}}
-		function marshall(obj,fid) % {{{
+		function marshall(obj,md,fid) % {{{
 
 			yts=365.0*24.0*3600.0;
Index: /issm/trunk-jpl/src/m/classes/inversion.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/inversion.py	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/inversion.py	(revision 15131)
@@ -143,5 +143,5 @@
 		return md
 	# }}}
-	def marshall(self,fid):    # {{{
+	def marshall(self,md,fid):    # {{{
 
 		yts=365.0*24.0*3600.0
Index: /issm/trunk-jpl/src/m/classes/mask.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/mask.m	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/mask.m	(revision 15131)
@@ -47,5 +47,5 @@
 			fielddisplay(obj,'vertexonrock','vertex on rock flags list');
 		end % }}}
-		function marshall(obj,fid) % {{{
+		function marshall(obj,md,fid) % {{{
 			WriteData(fid,'object',obj,'fieldname','elementonfloatingice','format','BooleanMat','mattype',2);
 			WriteData(fid,'object',obj,'fieldname','elementongroundedice','format','BooleanMat','mattype',2);
Index: /issm/trunk-jpl/src/m/classes/mask.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/mask.py	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/mask.py	(revision 15131)
@@ -49,5 +49,5 @@
 		return md
 	# }}}
-	def marshall(self,fid):    # {{{
+	def marshall(self,md,fid):    # {{{
 		WriteData(fid,'object',self,'fieldname','elementonfloatingice','format','BooleanMat','mattype',2)
 		WriteData(fid,'object',self,'fieldname','elementongroundedice','format','BooleanMat','mattype',2)
Index: /issm/trunk-jpl/src/m/classes/matdamageice.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/matdamageice.m	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/matdamageice.m	(revision 15131)
@@ -133,5 +133,5 @@
 
 		end % }}}
-		function marshall(obj,fid) % {{{
+		function marshall(obj,md,fid) % {{{
 			WriteData(fid,'enum',MaterialsEnum(),'data',MatdamageiceEnum(),'format','Integer');
 			WriteData(fid,'object',obj,'class','materials','fieldname','rho_ice','format','Double');
Index: /issm/trunk-jpl/src/m/classes/matdamageice.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/matdamageice.py	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/matdamageice.py	(revision 15131)
@@ -128,5 +128,5 @@
 		return md
 	# }}}
-	def marshall(self,fid):    # {{{
+	def marshall(self,md,fid):    # {{{
 		WriteData(fid,'enum',MaterialsEnum(),'data',MatdamageiceEnum(),'format','Integer')
 		WriteData(fid,'object',self,'class','materials','fieldname','rho_ice','format','Double')
Index: /issm/trunk-jpl/src/m/classes/matice.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/matice.m	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/matice.m	(revision 15131)
@@ -129,5 +129,5 @@
 			fielddisplay(obj,'mantle_density','Mantle density [g/cm^-3]');
 		end % }}}
-		function marshall(obj,fid) % {{{
+		function marshall(obj,md,fid) % {{{
 			WriteData(fid,'enum',MaterialsEnum(),'data',MaticeEnum(),'format','Integer');
 			WriteData(fid,'object',obj,'class','materials','fieldname','rho_ice','format','Double');
Index: /issm/trunk-jpl/src/m/classes/matice.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/matice.py	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/matice.py	(revision 15131)
@@ -121,5 +121,5 @@
 		return md
 	# }}}
-	def marshall(self,fid):    # {{{
+	def marshall(self,md,fid):    # {{{
 		WriteData(fid,'enum',MaterialsEnum(),'data',MaticeEnum(),'format','Integer');
 		WriteData(fid,'object',self,'class','materials','fieldname','rho_ice','format','Double')
Index: /issm/trunk-jpl/src/m/classes/mesh.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/mesh.m	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/mesh.m	(revision 15131)
@@ -187,5 +187,5 @@
 			fielddisplay(obj,'hemisphere','Indicate hemisphere ''n'' or ''s'' ');
 		end % }}}
-		function marshall(obj,fid) % {{{
+		function marshall(obj,md,fid) % {{{
 			WriteData(fid,'object',obj,'fieldname','x','format','DoubleMat','mattype',1);
 			WriteData(fid,'object',obj,'fieldname','y','format','DoubleMat','mattype',1);
Index: /issm/trunk-jpl/src/m/classes/mesh.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/mesh.py	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/mesh.py	(revision 15131)
@@ -170,5 +170,5 @@
 		return md
 	# }}}
-	def marshall(self,fid):    # {{{
+	def marshall(self,md,fid):    # {{{
 		WriteData(fid,'object',self,'fieldname','x','format','DoubleMat','mattype',1)
 		WriteData(fid,'object',self,'fieldname','y','format','DoubleMat','mattype',1)
Index: /issm/trunk-jpl/src/m/classes/miscellaneous.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/miscellaneous.m	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/miscellaneous.m	(revision 15131)
@@ -35,5 +35,5 @@
 
 		end % }}}
-		function marshall(obj,fid) % {{{
+		function marshall(obj,md,fid) % {{{
 			WriteData(fid,'object',obj,'fieldname','name','format','String');
 		end % }}}
Index: /issm/trunk-jpl/src/m/classes/miscellaneous.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/miscellaneous.py	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/miscellaneous.py	(revision 15131)
@@ -37,5 +37,5 @@
 		return md
 	# }}}
-	def marshall(self,fid):    #  {{{
+	def marshall(self,md,fid):    #  {{{
 		WriteData(fid,'object',self,'fieldname','name','format','String')
 	# }}}
Index: /issm/trunk-jpl/src/m/classes/oldclasses/hydrology.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/oldclasses/hydrology.m	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/oldclasses/hydrology.m	(revision 15131)
@@ -55,5 +55,5 @@
 
 		end % }}}
-		function marshall(obj,fid) % {{{
+		function marshall(obj,md,fid) % {{{
 			WriteData(fid,'object',obj,'fieldname','spcwatercolumn','format','DoubleMat','mattype',1);
 			WriteData(fid,'object',obj,'fieldname','n','format','Double');
Index: /issm/trunk-jpl/src/m/classes/pairoptions.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/pairoptions.m	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/pairoptions.m	(revision 15131)
@@ -243,5 +243,5 @@
 			end
 		end % }}}
-		function marshall(obj,fid,firstindex)% {{{
+		function marshall(obj,md,fid,firstindex)% {{{
 
 			for i=1:size(obj.list,1),
Index: /issm/trunk-jpl/src/m/classes/pairoptions.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/pairoptions.py	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/pairoptions.py	(revision 15131)
@@ -152,5 +152,5 @@
 				print "removefield info: option '%s' has been removed from the list of options." % field
 	# }}}
-	def marshall(self,fid,firstindex):    # {{{
+	def marshall(self,md,fid,firstindex):    # {{{
 
 		for i,item in enumerate(self.list.iteritems()):
Index: /issm/trunk-jpl/src/m/classes/planetmesh.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/planetmesh.m	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/planetmesh.m	(revision 15131)
@@ -105,5 +105,5 @@
 
 		end % }}}
-		function marshall(obj,fid) % {{{
+		function marshall(obj,md,fid) % {{{
 			WriteData(fid,'object',obj,'fieldname','x','format','DoubleMat','mattype',1);
 			WriteData(fid,'object',obj,'fieldname','y','format','DoubleMat','mattype',1);
Index: /issm/trunk-jpl/src/m/classes/prognostic.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/prognostic.m	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/prognostic.m	(revision 15131)
@@ -64,5 +64,5 @@
 
 		end % }}}
-		function marshall(obj,fid) % {{{
+		function marshall(obj,md,fid) % {{{
 			WriteData(fid,'object',obj,'fieldname','spcthickness','format','DoubleMat','mattype',1);
 			WriteData(fid,'object',obj,'fieldname','min_thickness','format','Double');
Index: /issm/trunk-jpl/src/m/classes/prognostic.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/prognostic.py	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/prognostic.py	(revision 15131)
@@ -67,5 +67,5 @@
 		return md
 	# }}}
-	def marshall(self,fid):    # {{{
+	def marshall(self,md,fid):    # {{{
 		WriteData(fid,'object',self,'fieldname','spcthickness','format','DoubleMat','mattype',1)
 		WriteData(fid,'object',self,'fieldname','min_thickness','format','Double')
Index: /issm/trunk-jpl/src/m/classes/qmu.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/qmu.m	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/qmu.m	(revision 15131)
@@ -140,5 +140,5 @@
 
 		end % }}}
-		function marshall(obj,fid) % {{{
+		function marshall(obj,md,fid) % {{{
 			WriteData(fid,'object',obj,'fieldname','isdakota','format','Boolean');
 			if ~obj.isdakota, 
Index: /issm/trunk-jpl/src/m/classes/qmu.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/qmu.py	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/qmu.py	(revision 15131)
@@ -134,5 +134,5 @@
 		return s
 	# }}}
-	def marshall(self,fid):    # {{{
+	def marshall(self,md,fid):    # {{{
 		WriteData(fid,'object',self,'fieldname','isdakota','format','Boolean')
 		if not self.isdakota:
Index: /issm/trunk-jpl/src/m/classes/results.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/results.py	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/results.py	(revision 15131)
@@ -50,5 +50,5 @@
 		return md
 	# }}}
-	def marshall(self,fid):    # {{{
+	def marshall(self,md,fid):    # {{{
 		pass
 	# }}}
Index: /issm/trunk-jpl/src/m/classes/rifts.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/rifts.m	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/rifts.m	(revision 15131)
@@ -54,5 +54,5 @@
 
 		end % }}}
-		function marshall(obj,fid) % {{{
+		function marshall(obj,md,fid) % {{{
 
 			%Process rift info
Index: /issm/trunk-jpl/src/m/classes/rifts.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/rifts.py	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/rifts.py	(revision 15131)
@@ -54,5 +54,5 @@
 		return md
 	# }}}
-	def marshall(self,fid):    # {{{
+	def marshall(self,md,fid):    # {{{
 
 		#Process rift info
Index: /issm/trunk-jpl/src/m/classes/settings.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/settings.m	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/settings.m	(revision 15131)
@@ -60,5 +60,5 @@
 
 		end % }}}
-		function marshall(obj,fid) % {{{
+		function marshall(obj,md,fid) % {{{
 			WriteData(fid,'object',obj,'fieldname','io_gather','format','Boolean');
 			WriteData(fid,'object',obj,'fieldname','lowmem','format','Boolean');
Index: /issm/trunk-jpl/src/m/classes/settings.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/settings.py	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/settings.py	(revision 15131)
@@ -64,5 +64,5 @@
 		return md
 	# }}}
-	def marshall(self,fid):    # {{{
+	def marshall(self,md,fid):    # {{{
 		WriteData(fid,'object',self,'fieldname','io_gather','format','Boolean')
 		WriteData(fid,'object',self,'fieldname','lowmem','format','Boolean')
Index: /issm/trunk-jpl/src/m/classes/steadystate.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/steadystate.m	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/steadystate.m	(revision 15131)
@@ -47,5 +47,5 @@
 
 		end % }}}
-		function marshall(obj,fid) % {{{
+		function marshall(obj,md,fid) % {{{
 			WriteData(fid,'object',obj,'fieldname','reltol','format','Double');
 			WriteData(fid,'object',obj,'fieldname','maxiter','format','Integer');
Index: /issm/trunk-jpl/src/m/classes/steadystate.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/steadystate.py	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/steadystate.py	(revision 15131)
@@ -53,5 +53,5 @@
 		return md
 	# }}}
-	def marshall(self,fid):    # {{{
+	def marshall(self,md,fid):    # {{{
 		WriteData(fid,'object',self,'fieldname','reltol','format','Double')
 		WriteData(fid,'object',self,'fieldname','maxiter','format','Integer')
Index: /issm/trunk-jpl/src/m/classes/surfaceforcings.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/surfaceforcings.m	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/surfaceforcings.m	(revision 15131)
@@ -100,5 +100,5 @@
 
 		end % }}}
-		function marshall(obj,fid) % {{{
+		function marshall(obj,md,fid) % {{{
 
 			yts=365.0*24.0*3600.0;
Index: /issm/trunk-jpl/src/m/classes/surfaceforcings.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/surfaceforcings.py	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/surfaceforcings.py	(revision 15131)
@@ -100,5 +100,5 @@
 		return md
 	# }}}
-	def marshall(self,fid):    # {{{
+	def marshall(self,md,fid):    # {{{
 
 		yts=365.0*24.0*3600.0
Index: /issm/trunk-jpl/src/m/classes/taoinversion.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/taoinversion.m	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/taoinversion.m	(revision 15131)
@@ -115,5 +115,5 @@
 			disp('   503: ThicknessAbsGradient');
 		end % }}}
-		function marshall(obj,fid) % {{{
+		function marshall(obj,md,fid) % {{{
 
 			WriteData(fid,'object',obj,'class','inversion','fieldname','iscontrol','format','Boolean');
Index: /issm/trunk-jpl/src/m/classes/thermal.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/thermal.m	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/thermal.m	(revision 15131)
@@ -65,5 +65,5 @@
 
 		end % }}}
-		function marshall(obj,fid) % {{{
+		function marshall(obj,md,fid) % {{{
 			WriteData(fid,'object',obj,'fieldname','spctemperature','format','DoubleMat','mattype',1);
 			WriteData(fid,'object',obj,'fieldname','penalty_threshold','format','Integer');
Index: /issm/trunk-jpl/src/m/classes/thermal.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/thermal.py	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/thermal.py	(revision 15131)
@@ -71,5 +71,5 @@
 		return md
 	# }}}
-	def marshall(self,fid):    # {{{
+	def marshall(self,md,fid):    # {{{
 		WriteData(fid,'object',self,'fieldname','spctemperature','format','DoubleMat','mattype',1)
 		WriteData(fid,'object',self,'fieldname','penalty_threshold','format','Integer')
Index: /issm/trunk-jpl/src/m/classes/timestepping.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/timestepping.m	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/timestepping.m	(revision 15131)
@@ -54,5 +54,5 @@
 
 		end % }}}
-		function marshall(obj,fid) % {{{
+		function marshall(obj,md,fid) % {{{
 
 			yts=365.0*24.0*3600.0;
Index: /issm/trunk-jpl/src/m/classes/timestepping.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/timestepping.py	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/timestepping.py	(revision 15131)
@@ -58,5 +58,5 @@
 		return md
 	# }}}
-	def marshall(self,fid):    # {{{
+	def marshall(self,md,fid):    # {{{
 
 		yts=365.0*24.0*3600.0
Index: /issm/trunk-jpl/src/m/classes/transient.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/transient.m	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/transient.m	(revision 15131)
@@ -56,5 +56,5 @@
 
 		end % }}}
-		function marshall(obj,fid) % {{{
+		function marshall(obj,md,fid) % {{{
 			WriteData(fid,'object',obj,'fieldname','isprognostic','format','Boolean');
 			WriteData(fid,'object',obj,'fieldname','isdiagnostic','format','Boolean');
Index: /issm/trunk-jpl/src/m/classes/transient.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/transient.py	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/transient.py	(revision 15131)
@@ -61,5 +61,5 @@
 		return md
 	# }}}
-	def marshall(self,fid):    # {{{
+	def marshall(self,md,fid):    # {{{
 		WriteData(fid,'object',self,'fieldname','isprognostic','format','Boolean')
 		WriteData(fid,'object',self,'fieldname','isdiagnostic','format','Boolean')
Index: /issm/trunk-jpl/src/m/classes/verbose.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/verbose.m	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/verbose.m	(revision 15131)
@@ -126,5 +126,5 @@
 		end
 		%}}}
-		function marshall(obj,fid) % {{{
+		function marshall(obj,md,fid) % {{{
 			WriteData(fid,'data',VerboseToBinary(obj),'enum',VerboseEnum(),'format','Integer');
 		end % }}}
Index: /issm/trunk-jpl/src/m/classes/verbose.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/verbose.py	(revision 15130)
+++ /issm/trunk-jpl/src/m/classes/verbose.py	(revision 15131)
@@ -128,5 +128,5 @@
 		return md
 	# }}}
-	def marshall(self,fid):    # {{{
+	def marshall(self,md,fid):    # {{{
 		WriteData(fid,'data',self.VerboseToBinary(),'enum',VerboseEnum(),'format','Integer')
 	# }}}
Index: /issm/trunk-jpl/src/m/solve/marshall.m
===================================================================
--- /issm/trunk-jpl/src/m/solve/marshall.m	(revision 15130)
+++ /issm/trunk-jpl/src/m/solve/marshall.m	(revision 15131)
@@ -36,5 +36,5 @@
 	%Marshall current object
 	%disp(['marshalling ' field '...']);
-	marshall(md.(field),fid);
+	marshall(md.(field),md,fid);
 end
 
Index: /issm/trunk-jpl/src/m/solve/marshall.py
===================================================================
--- /issm/trunk-jpl/src/m/solve/marshall.py	(revision 15130)
+++ /issm/trunk-jpl/src/m/solve/marshall.py	(revision 15131)
@@ -40,5 +40,5 @@
 		#Marshall current object
 		#print "marshalling %s ..." % field
-		exec("md.%s.marshall(fid)" % field)
+		exec("md.%s.marshall(md,fid)" % field)
 
 	#close file