Changeset 21341 for issm/trunk/src/m/plot/processmesh.py

Timestamp:

11/04/16 13:48:43 (8 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 21337

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/plot/processmesh.py (modified) (3 diffs)

issm/trunk/src/m/plot/processmesh.py

@@ -1 +1 @@
 from math import isnan
-import MatlabFuncs as m
-import numpy as npy
+import numpy as  np
 
 def processmesh(md,data,options):
@@ -13 +12 @@
         """
 
-        #some checks
+        # {{{ check mesh size parameters
         if md.mesh.numberofvertices==0:
                 raise ValueError('processmesh error: mesh is empty')
         if md.mesh.numberofvertices==md.mesh.numberofelements:
                 raise ValueError('processmesh error: the number of elements is the same as the number of nodes')
-
+        # }}}
+        # {{{ treating non data plots mesh
         if len(data)==0 or not isinstance(data,dict):
-                
                 if 'latlon' not in options.getfieldvalue('coord','xy').lower(): #convert to lower case for comparison
-                        x=md.mesh.x
-                        if 'x2d' in dir(md.mesh): x2d=md.mesh.x2d
-                        y=md.mesh.y
-                        if 'y2d' in dir(md.mesh): y2d=md.mesh.x2d
+                        try:
+                                x=md.mesh.x2d
+                        except AttributeError:
+                                x=md.mesh.x
+                        try:
+                                y=md.mesh.x2d
+                        except AttributeError:                          
+                                y=md.mesh.y
                 else:
                         x=md.mesh.long
                         y=md.mesh.lat
-
-                if 'z' in dir(md.mesh):
+                try:
                         z=md.mesh.z
-                else:
-                        z=npy.zeros_like(md.mesh.x)
+                except AttributeError:
+                        z=np.zeros_like(md.mesh.x)
                 
-                if 'elements2d' in dir(md.mesh): 
-                        elements2d=md.mesh.elements2d
-                        elements2d=elements2d-1  # subtract one since python indexes from zero
-                elements=md.mesh.elements
-                elements=elements-1
+                try:
+                        elements2d=md.mesh.elements2d-1
+                except AttributeError:
+                        elements=md.mesh.elements-1
 
                 #is it a 2D plot?
-                if md.mesh.dimension()==2:
+                if md.mesh.dimension()==2 or options.getfieldvalue('layer',0)>=1:
                         is2d=1
                 else:
-                        if options.getfieldvalue('layer',0)>=1:
-                                is2d=1
-                        else:
-                                is2d=0
+                        is2d=0
 
                 #layer projection?
@@ -54 +52 @@
                          if 'latlon' in options.getfieldvalue('coord','xy').lower():
                                  raise ValueError('processmesh error: cannot work with 3D mesh in lat-lon coords')
-                        #we modify the mesh temporarily to a 2D mesh from which the 3D mesh was extruded
-                         x=x2d
-                         y=y2d
-                         z=zeros(size(x2d))
-                         elements=elements2d
-        
+                         #we modify the mesh temporarily to a 2D mesh from which the 3D mesh was extruded
+                   #Basile: does not seem necessary as we already picked x as x2d
+                   # x=x2d
+                         # y=y2d
+                         # z=zeros(size(x2d))
+                         # elements=elements2d
         else:
                 #Process mesh for plotting