Changeset 20690 for issm/trunk-jpl/src/m/classes/mesh2d.m

Timestamp:

06/03/16 10:05:11 (9 years ago)

Author:

Mathieu Morlighem

Message:

NEW: marhsall strings instead of enums

File:

• issm/trunk-jpl/src/m/classes/mesh2d.m (modified) (1 diff)

issm/trunk-jpl/src/m/classes/mesh2d.m

@@ -127 +127 @@
                         fielddisplay(self,'epsg','EPSG code (ex: 3413 for UPS Greenland, 3031 for UPS Antarctica)');
                 end % }}}
-                function marshall(self,md,fid) % {{{
-                        WriteData(fid,'enum',DomainTypeEnum(),'data',StringToEnum(['Domain' domaintype(self)]),'format','Integer');
-                        WriteData(fid,'enum',DomainDimensionEnum(),'data',dimension(self),'format','Integer');
-                        WriteData(fid,'enum',MeshElementtypeEnum(),'data',StringToEnum(elementtype(self)),'format','Integer');
-                        WriteData(fid,'object',self,'class','mesh','fieldname','x','format','DoubleMat','mattype',1);
-                        WriteData(fid,'object',self,'class','mesh','fieldname','y','format','DoubleMat','mattype',1);
-                        WriteData(fid,'enum',MeshZEnum(),'data',zeros(self.numberofvertices,1),'format','DoubleMat','mattype',1);
-                        WriteData(fid,'object',self,'class','mesh','fieldname','elements','format','DoubleMat','mattype',2);
-                        WriteData(fid,'object',self,'class','mesh','fieldname','numberofelements','format','Integer');
-                        WriteData(fid,'object',self,'class','mesh','fieldname','numberofvertices','format','Integer');
-                        WriteData(fid,'object',self,'class','mesh','fieldname','average_vertex_connectivity','format','Integer');
-                        WriteData(fid,'object',self,'class','mesh','fieldname','vertexonboundary','format','DoubleMat','mattype',1);
-                        WriteData(fid,'object',self,'class','mesh','fieldname','segments','format','DoubleMat','mattype',3);
+                function marshall(self,prefix,md,fid) % {{{
+                        WriteData(fid,prefix,'name','md.mesh.domain_type','data',StringToEnum(['Domain' domaintype(self)]),'format','Integer');
+                        WriteData(fid,prefix,'name','md.mesh.domain_dimension','data',dimension(self),'format','Integer');
+                        WriteData(fid,prefix,'name','md.mesh.elementtype','data',StringToEnum(elementtype(self)),'format','Integer');
+                        WriteData(fid,prefix,'object',self,'class','mesh','fieldname','x','format','DoubleMat','mattype',1);
+                        WriteData(fid,prefix,'object',self,'class','mesh','fieldname','y','format','DoubleMat','mattype',1);
+                        WriteData(fid,prefix,'name','md.mesh.z','data',zeros(self.numberofvertices,1),'format','DoubleMat','mattype',1);
+                        WriteData(fid,prefix,'object',self,'class','mesh','fieldname','elements','format','DoubleMat','mattype',2);
+                        WriteData(fid,prefix,'object',self,'class','mesh','fieldname','numberofelements','format','Integer');
+                        WriteData(fid,prefix,'object',self,'class','mesh','fieldname','numberofvertices','format','Integer');
+                        WriteData(fid,prefix,'object',self,'class','mesh','fieldname','average_vertex_connectivity','format','Integer');
+                        WriteData(fid,prefix,'object',self,'class','mesh','fieldname','vertexonboundary','format','DoubleMat','mattype',1);
+                        WriteData(fid,prefix,'object',self,'class','mesh','fieldname','segments','format','DoubleMat','mattype',3);
                 end % }}}
                 function t = domaintype(self) % {{{