Changeset 16560 for issm/trunk/src/m/classes/mesh.py

Timestamp:

10/28/13 14:43:03 (11 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 16554

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/classes/mesh.py (modified) (2 diffs)

issm/trunk/src/m/classes/mesh.py

@@ -56 +56 @@
                 #set defaults
                 self.setdefaultparameters()
-
                 #}}}
         def __repr__(self): # {{{
@@ -163 +162 @@
                 return md
         # }}}
+        def meshtype(self): # {{{
+
+                if self.dimension==2:
+                        return "2Dhorizontal"
+                else:
+                        return "3D"
+        #}}}
         def marshall(self,md,fid):    # {{{
+                WriteData(fid,'enum',MeshTypeEnum(),'data',StringToEnum("Mesh"+self.meshtype())[0],'format','Integer');
                 WriteData(fid,'object',self,'fieldname','x','format','DoubleMat','mattype',1)
                 WriteData(fid,'object',self,'fieldname','y','format','DoubleMat','mattype',1)
                 WriteData(fid,'object',self,'fieldname','z','format','DoubleMat','mattype',1)
                 WriteData(fid,'object',self,'fieldname','elements','format','DoubleMat','mattype',2)
-                WriteData(fid,'object',self,'fieldname','dimension','format','Integer')
                 WriteData(fid,'object',self,'fieldname','numberoflayers','format','Integer')
                 WriteData(fid,'object',self,'fieldname','numberofelements','format','Integer')