Changeset 20225

Timestamp:

02/21/16 23:25:36 (9 years ago)

Author:

dlcheng

Message:

ADD: maskpsl and gmtmask python versions. CHG: mesh3dsurface.py checkfield corrections

Location:

issm/trunk-jpl/src/m

Files:

• classes/maskpsl.py (added)
• classes/mesh3dsurface.py (modified) (10 diffs)
• coordsystems/gmtmask.py (added)

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

@@ -3 +3 @@
 from EnumDefinitions import *
 from numpy import *
+from fielddisplay import fielddisplay
+from checkfield import checkfield
+from WriteData import WriteData
 
 class mesh3dsurface(object):
@@ -33 +36 @@
                 self.extractedelements           = NaN
                 
-                if len(args)==0:
+                if not len(args):
                         self.setdefaultparameters()
                 elif len(args)==1:
@@ -46 +49 @@
                         raise RuntimeError('constructor not supported') 
 
-                #set defaults
-                self.setdefaultparameters()
-        #}}}
+        # }}}
         def __repr__(self): # {{{
                 string='   2D tria Mesh (horizontal):'
+                
                 string+='\n      Elements and vertices:'
                 string="%s\n%s"%(string,fielddisplay(self,'numberofelements','number of elements'))
@@ -76 +78 @@
                 string="%s\n%s"%(string,fielddisplay(self,'extractedvertices','vertices extracted from the model()'))
                 string="%s\n%s"%(string,fielddisplay(self,'extractedelements','elements extracted from the model()')) 
-                # }}}
+                
+                return string
+        # }}}
         def loadobj(self): # {{{
                 # This def is directly called by matlab when a model() selfect is
@@ -92 +96 @@
                                 else:
                                         self.epsg=3031
-                # }}}
+                return self
+        # }}}
         def setdefaultparameters(self): # {{{
 
@@ -102 +107 @@
                 self.average_vertex_connectivity=25
                 return self
-                # }}}
+        # }}}
         def checkconsistency(self,md,solution,analyses): # {{{
 
-                md = checkfield(md,'fieldname','mesh.x','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices,1])
-                md = checkfield(md,'fieldname','mesh.y','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices,1])
-                md = checkfield(md,'fieldname','mesh.z','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices,1])
-                md = checkfield(md,'fieldname','mesh.lat','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices,1])
-                md = checkfield(md,'fieldname','mesh.long','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices,1])
-                md = checkfield(md,'fieldname','mesh.r','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices,1])
-                md = checkfield(md,'fieldname','mesh.elements','NaN',1,'Inf',1,'>',0,'values',[md.mesh.numberofvertices])
+                md = checkfield(md,'fieldname','mesh.x','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
+                md = checkfield(md,'fieldname','mesh.y','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
+                md = checkfield(md,'fieldname','mesh.z','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
+                md = checkfield(md,'fieldname','mesh.lat','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
+                md = checkfield(md,'fieldname','mesh.long','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
+                md = checkfield(md,'fieldname','mesh.r','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
+                md = checkfield(md,'fieldname','mesh.elements','NaN',1,'Inf',1,'>',0,'values',arange(1,md.mesh.numberofvertices+1))
                 md = checkfield(md,'fieldname','mesh.elements','size',[md.mesh.numberofelements,3])
                 if any(not ismember([md.mesh.numberofvertices],sort(unique(md.mesh.elements)))):
@@ -124 +129 @@
                         
                 return md
-                # }}}
+        # }}}
         def marshall(self,md,fid): # {{{
-                WriteData(fid,'enum',DomainTypeEnum(),'data',StringToEnum(['Domain', domaintype(obj)]),'format','Integer')
-                WriteData(fid,'enum',DomainDimensionEnum(),'data',dimension(obj),'format','Integer')
-                WriteData(fid,'enum',MeshElementtypeEnum(),'data',StringToEnum(elementtype(obj)),'format','Integer')
+                WriteData(fid,'enum',DomainTypeEnum(),'data',StringToEnum(['Domain', self.domaintype()]),'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',MeshLatEnum(),'data',obj.lat,'format','DoubleMat','mattype',1)
-                WriteData(fid,'enum',MeshLongEnum(),'data',obj.long,'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(obj.numberofvertices,1),'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')
@@ -141 +146 @@
                 WriteData(fid,'object',obj,'class','mesh','fieldname','average_vertex_connectivity','format','Integer')
                 WriteData(fid,'object',obj,'class','mesh','fieldname','vertexonboundary','format','DoubleMat','mattype',1)
-                # }}}
+        # }}}
         def domaintype(self): # {{{
                 return '3Dsurface'
-                # }}}
+        # }}}
         def dimension(self): # {{{
                 return 2
-                # }}}
+        # }}}
         def elementtype(self): # {{{
                 return 'Tria'
-                # }}}
+        # }}}
         def processmesh(self,options): # {{{
         
@@ -161 +166 @@
                 z        = self.z
                 return [x, y, z, elements, is2d, isplanet]
-                # }}}
+        # }}}
         def savemodeljs(self,fid,modelname): # {{{
         
@@ -185 +190 @@
                 writejs1Darray(fid,[modelname, '.mesh.extractedelements'],self.extractedelements)
 
-                # }}}
+        # }}}