Changeset 20970

Timestamp:

07/20/16 22:01:03 (9 years ago)

Author:

agscott1

Message:

CHG: Updated mesh2dvertical, mesh3dprisms, mesh3dsurface, and mesh3dtetras to use a String when marshalling md.mesh.domain_type and md.mesh.elementtype

Location:

issm/trunk-jpl/src/m/classes

Files:

• mesh2dvertical.m (modified) (1 diff)
• mesh3dprisms.js (modified) (1 diff)
• mesh3dprisms.m (modified) (1 diff)
• mesh3dprisms.py (modified) (1 diff)
• mesh3dsurface.js (modified) (1 diff)
• mesh3dsurface.m (modified) (1 diff)
• mesh3dsurface.py (modified) (1 diff)
• mesh3dtetras.m (modified) (1 diff)

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

@@ -126 +126 @@
                 end % }}}
                 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_type','data',['Domain' domaintype(self)],'format','String');
                         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,'name','md.mesh.elementtype','data',elementtype(self),'format','String');
                         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);

issm/trunk-jpl/src/m/classes/mesh3dprisms.js

@@ -77 +77 @@
                 } // }}}
                 this.marshall = function(md,prefix,fid) { // {{{
-                        WriteData(fid,prefix,'name','md.mesh.domain_type','data',StringToEnum('Domain' + this.domaintype()),'format','Integer');
+                        WriteData(fid,prefix,'name','md.mesh.domain_type','data','Domain' + this.domaintype(),'format','String');
                         WriteData(fid,prefix,'name','md.mesh.domain_dimension','data',this.dimension(),'format','Integer');
-                        WriteData(fid,prefix,'name','md.mesh.elementtype','data',StringToEnum(this.elementtype()),'format','Integer');
+                        WriteData(fid,prefix,'name','md.mesh.elementtype','data',this.elementtype(),'format','String');
                         WriteData(fid,prefix,'object',this,'class','mesh','fieldname','x','format','DoubleMat','mattype',1);
                         WriteData(fid,prefix,'object',this,'class','mesh','fieldname','y','format','DoubleMat','mattype',1);

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

@@ -150 +150 @@
                 end % }}}
                 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_type','data',['Domain' domaintype(self)],'format','String');
                         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,'name','md.mesh.elementtype','data',elementtype(self),'format','String');
                         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);

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

@@ -132 +132 @@
         #}}}
         def marshall(self,prefix,md,fid):    # {{{
-                WriteData(fid,prefix,'name','md.mesh.domain_type','data',StringToEnum("Domain"+self.domaintype())[0],'format','Integer');
+                WriteData(fid,prefix,'name','md.mesh.domain_type','data',"Domain"+self.domaintype(),'format','String');
                 WriteData(fid,prefix,'name','md.mesh.domain_dimension','data',self.dimension(),'format','Integer');
-                WriteData(fid,prefix,'name','md.mesh.elementtype','data',StringToEnum(self.elementtype())[0],'format','Integer');
+                WriteData(fid,prefix,'name','md.mesh.elementtype','data',self.elementtype(),'format','String');
                 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)

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

@@ -78 +78 @@
                 } // }}}
                 this.marshall=function(md,prefix,fid) { //{{{
-                        WriteData(fid,prefix,'name','md.mesh.domain_type','data',StringToEnum('Domain' + this.domaintype()),'format','Integer');
+                        WriteData(fid,prefix,'name','md.mesh.domain_type','data','Domain' + this.domaintype(),'format','String');
                         WriteData(fid,prefix,'name','md.mesh.domain_dimension','data',this.dimension(),'format','Integer');
-                        WriteData(fid,prefix,'name','md.mesh.elementtype','data',StringToEnum(this.elementtype()),'format','Integer');
+                        WriteData(fid,prefix,'name','md.mesh.elementtype','data',this.elementtype(),'format','String');
                         WriteData(fid,prefix,'object',this,'fieldname','x','format','DoubleMat','mattype',1);
                         WriteData(fid,prefix,'object',this,'fieldname','y','format','DoubleMat','mattype',1);

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

@@ -131 +131 @@
                 end % }}}
                 function marshall(obj,prefix,md,fid) % {{{
-                        WriteData(fid,prefix,'name','md.mesh.domain_type','data',StringToEnum(['Domain' domaintype(obj)]),'format','Integer');
+                        WriteData(fid,prefix,'name','md.mesh.domain_type','data',['Domain' domaintype(obj)],'format','String');
                         WriteData(fid,prefix,'name','md.mesh.domain_dimension','data',dimension(obj),'format','Integer');
-                        WriteData(fid,prefix,'name','md.mesh.elementtype','data',StringToEnum(elementtype(obj)),'format','Integer');
+                        WriteData(fid,prefix,'name','md.mesh.elementtype','data',elementtype(obj),'format','String');
                         WriteData(fid,prefix,'object',obj,'fieldname','x','format','DoubleMat','mattype',1);
                         WriteData(fid,prefix,'object',obj,'fieldname','y','format','DoubleMat','mattype',1);

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

@@ -131 +131 @@
         # }}}
         def marshall(self,prefix,md,fid): # {{{
-                WriteData(fid,prefix,'name','md.mesh.domain_type','data',StringToEnum('Domain' + self.domaintype())[0],'format','Integer')
+                WriteData(fid,prefix,'name','md.mesh.domain_type','data','Domain' + self.domaintype(),'format','String')
                 WriteData(fid,prefix,'name','md.mesh.domain_dimension','data',self.dimension(),'format','Integer')
-                WriteData(fid,prefix,'name','md.mesh.elementtype','data',StringToEnum(self.elementtype())[0],'format','Integer')
+                WriteData(fid,prefix,'name','md.mesh.elementtype','data',self.elementtype(),'format','String')
                 WriteData(fid,prefix,'object',self,'fieldname','x','format','DoubleMat','mattype',1)
                 WriteData(fid,prefix,'object',self,'fieldname','y','format','DoubleMat','mattype',1)

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

@@ -150 +150 @@
                 end % }}}
                 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_type','data',['Domain' domaintype(self)],'format','String');
                         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,'name','md.mesh.elementtype','data',elementtype(self),'format','String');
                         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);