Changeset 16292

Timestamp:

10/03/13 14:54:11 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: removed mesh dimension and replaced by meshtype (I know... type is not good but I could not come up with anything better), prepare changes for flowband model

Location:

issm/trunk-jpl/src/m/classes

Files:

• mesh.m (modified) (2 diffs)
• mesh.py (modified) (2 diffs)

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

@@ -181 +181 @@
                 end % }}}
                 function marshall(obj,md,fid) % {{{
+                        WriteData(fid,'enum',MeshTypeEnum(),'data',StringToEnum(['Mesh' meshtype(obj)]),'format','Integer');
+                        WriteData(fid,'object',obj,'fieldname','dimension','format','Integer');
                         WriteData(fid,'object',obj,'fieldname','x','format','DoubleMat','mattype',1);
                         WriteData(fid,'object',obj,'fieldname','y','format','DoubleMat','mattype',1);
                         WriteData(fid,'object',obj,'fieldname','z','format','DoubleMat','mattype',1);
                         WriteData(fid,'object',obj,'fieldname','elements','format','DoubleMat','mattype',2);
-                        WriteData(fid,'object',obj,'fieldname','dimension','format','Integer');
                         WriteData(fid,'object',obj,'fieldname','numberoflayers','format','Integer');
                         WriteData(fid,'object',obj,'fieldname','numberofelements','format','Integer');
@@ -200 +201 @@
                         WriteData(fid,'object',obj,'fieldname','numberofelements2d','format','Integer');
                 end % }}}
+                function type = meshtype(obj) % {{{
+                        if obj.dimension==2,
+                                type = '2Dhorizontal';
+                        else
+                                type = '3D';
+                        end
+                end % }}}
         end
 end

issm/trunk-jpl/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)