Changeset 20278

Timestamp:

03/01/16 20:15:13 (9 years ago)

Author:

Eric.Larour

Message:

CHG: fixes some issues with marshall routine.

File:

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

issm/trunk-jpl/src/m/classes/mesh3dsurface.py

@@ -131 +131 @@
         # }}}
         def marshall(self,md,fid): # {{{
-                WriteData(fid,'enum',DomainTypeEnum(),'data',StringToEnum(['Domain', self.domaintype()]),'format','Integer')
+                WriteData(fid,'enum',DomainTypeEnum(),'data',StringToEnum('Domain' + self.domaintype())[0],'format','Integer')
                 WriteData(fid,'enum',DomainDimensionEnum(),'data',self.dimension(),'format','Integer')
-                WriteData(fid,'enum',MeshElementtypeEnum(),'data',StringToEnum(self.elementtype()),'format','Integer')
-                WriteData(fid,'object',obj,'class','mesh','fieldname','x','format','DoubleMat','mattype',1)
-                WriteData(fid,'object',obj,'class','mesh','fieldname','y','format','DoubleMat','mattype',1)
-                WriteData(fid,'object',obj,'class','mesh','fieldname','z','format','DoubleMat','mattype',1)
+                WriteData(fid,'enum',MeshElementtypeEnum(),'data',StringToEnum(self.elementtype())[0],'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,'object',self,'class','mesh','fieldname','z','format','DoubleMat','mattype',1)
                 WriteData(fid,'enum',MeshLatEnum(),'data',md.mesh.lat,'format','DoubleMat','mattype',1)
                 WriteData(fid,'enum',MeshLongEnum(),'data',md.mesh.long,'format','DoubleMat','mattype',1)
-                WriteData(fid,'object',obj,'class','mesh','fieldname','r','format','DoubleMat','mattype',1)
-                WriteData(fid,'enum',MeshZEnum(),'data',zeros(md.mesh.numberofvertices,1),'format','DoubleMat','mattype',1)
-                WriteData(fid,'object',obj,'class','mesh','fieldname','elements','format','DoubleMat','mattype',2)
-                WriteData(fid,'object',obj,'class','mesh','fieldname','numberofelements','format','Integer')
-                WriteData(fid,'object',obj,'class','mesh','fieldname','numberofvertices','format','Integer')
-                WriteData(fid,'object',obj,'class','mesh','fieldname','average_vertex_connectivity','format','Integer')
-                WriteData(fid,'object',obj,'class','mesh','fieldname','vertexonboundary','format','DoubleMat','mattype',1)
+                WriteData(fid,'object',self,'class','mesh','fieldname','r','format','DoubleMat','mattype',1)
+                WriteData(fid,'enum',MeshZEnum(),'data',zeros(md.mesh.numberofvertices),'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)
         # }}}
         def domaintype(self): # {{{