Changeset 20919

Timestamp:

07/14/16 20:53:59 (9 years ago)

Author:

Mathieu Morlighem

Message:

CHG: cleaning up, do not include 'enum' in WriteData

Location:

issm/trunk-jpl/src/m/classes

Files:

• pairoptions.py (modified) (1 diff)
• slr.js (modified) (1 diff)

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

@@ -158 +158 @@
                         value = item[1]
 
-                        #Write option name
-                        WriteData(fid,prefix,'enum',(firstindex-1)+2*i+1,'data',name,'format','String')
+                        raise NameError('need to sync with MATLAB')
 
-                        #Write option value
-                        if   isinstance(value,(str,unicode)):
-                                WriteData(fid,prefix,'enum',(firstindex-1)+2*i+2,'data',value,'format','String')
-                        elif isinstance(value,(bool,int,long,float)):
-                                WriteData(fid,prefix,'enum',(firstindex-1)+2*i+2,'data',value,'format','Double')
-                        else:
-                                raise TypeError("Cannot marshall option '%s': format not supported yet." % name)
+                        ##Write option name
+                        #WriteData(fid,prefix,'enum',(firstindex-1)+2*i+1,'data',name,'format','String')
+
+                        ##Write option value
+                        #if   isinstance(value,(str,unicode)):
+                        #       WriteData(fid,prefix,'enum',(firstindex-1)+2*i+2,'data',value,'format','String')
+                        #elif isinstance(value,(bool,int,long,float)):
+                        #       WriteData(fid,prefix,'enum',(firstindex-1)+2*i+2,'data',value,'format','Double')
+                        #else:
+                                #raise TypeError("Cannot marshall option '%s': format not supported yet." % name)
         # }}}

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

@@ -86 +86 @@
 
                         WriteData(fid,prefix,'object',this,'fieldname','deltathickness','format','DoubleMat','mattype',2);
-                        WriteData(fid,prefix,'object',this,'fieldname','sealevel','mattype',1,'format','DoubleMat','enum',SealevelEnum(),'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
+                        WriteData(fid,prefix,'object',this,'fieldname','sealevel','mattype',1,'format','DoubleMat','timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
                         WriteData(fid,prefix,'object',this,'fieldname','reltol','format','Double');
                         WriteData(fid,prefix,'object',this,'fieldname','abstol','format','Double');