Changeset 13440

Timestamp:

09/25/12 15:43:03 (12 years ago)

Author:

cborstad

Message:

NEW: processdata and plot_unit for python plotting, some new plot options added, preliminary element and node plots

Location:

issm/trunk-jpl/src/m/plot

Files:

• applyoptions.py (modified) (3 diffs)
• plot_manager.py (modified) (2 diffs)
• plot_mesh.py (modified) (1 diff)
• plot_unit.py (added)
• plotmodel.py (modified) (2 diffs)
• processdata.m (modified) (1 diff)
• processdata.py (added)
• processmesh.py (modified) (5 diffs)

issm/trunk-jpl/src/m/plot/applyoptions.py

@@ -139 +139 @@
         #grid {{{
         if options.exist('grid'):
-                p.grid()
+                if 'on' in options.getfieldvalue('grid','on'):
+                        p.grid()
         #}}}
 
@@ -146 +147 @@
         #wrapping
 
-        #colorbar
+        #colorbar {{{
+        if 'on' in options.getfieldvalue('colorbar','on'):
+                p.colorbar()
+        #}}}
 
         #area
@@ -161 +165 @@
 
         #contours
-
-
-
 
         #axis positions

issm/trunk-jpl/src/m/plot/plot_manager.py

@@ -1 +1 @@
 from pairoptions import *
 import pylab as p
-from checkplotoptions import *
-from plot_mesh import *
+from checkplotoptions import checkplotoptions
+from plot_mesh import plot_mesh
+from processmesh import processmesh
+from processdata import processdata
+from plot_unit import plot_unit
+from applyoptions import applyoptions
 
 def plot_manager(md,options,subplotwidth,nlines,ncols,i):
@@ -25 +29 @@
 
                 # convert string to lower case for a case-insensitive comparison
-                if data.lower()=='mesh': plot_mesh(md,options,nlines,ncols,i)
+                if data.lower()=='mesh': 
+                        plot_mesh(md,options,nlines,ncols,i)
+                        return
                 else:
                         print "WARNING: '%s' is not implemented or is not a valid string for option 'data'" % data
 
         #elif data in vars(md):
-        else:
-                print "'data' not a string, plotting model properties yet to be implemented..."
+        #else:
+                #print "'data' not a string, plotting model properties yet to be implemented..."
 
-        
+        #Overlay plot
+
+        #Gridded plot
+
+        #Section plot
+
+        #Profile plot
+
+        #process data and model
+        x,y,z,elements,is2d,isplanet=processmesh(md,data,options)
+        data2,datatype=processdata(md,data,options)
+
+        #standard plot
+        p.subplot(nlines,ncols,i)
+
+        #plot unit
+        plot_unit(x,y,z,elements,data2,is2d,isplanet,datatype,options)
+
+        #apply all options
+        applyoptions(md,data2,options)
+
+        #ground overlay on kml plot_unit

issm/trunk-jpl/src/m/plot/plot_mesh.py

@@ -13 +13 @@
         '''
 
-        x,y,z,elements,is2d=processmesh(md,[],options)
+        x,y,z,elements,is2d,isplanet=processmesh(md,[],options)
 
         if is2d:

issm/trunk-jpl/src/m/plot/plotmodel.py

@@ -41 +41 @@
         #Go through plots
         if numberofplots:
-        
+                
                 #Create figure
                 #plots will be visible by default if ipython is run in interactive mode (invoked by ipython --pylab)
@@ -52 +52 @@
                 else:
                         p.figure(figurenumber)
-
-        
+                        
                 #try:
                 for i in xrange(numberofplots):

issm/trunk-jpl/src/m/plot/processdata.m

@@ -48 +48 @@
 end
 
-%get datatype
+%get datasize
 datasize=size(data);
 
-%Process NaN if any (do not now before mask is applied)
+%Process NaN if any (do not know before mask is applied)
 if exist(options,'nan')
         data(find(isnan(data)))=getfieldvalue(options,'nan',0);

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

@@ -17 +17 @@
                 raise ValueError('processmesh error: the number of elements is the same as the number of nodes')
 
-        if not data or not isinstance(data,dict):
+        if len(data)==0 or not isinstance(data,dict):
                 
                 if 'latlon' not in options.getfieldvalue('coord','xy').lower(): #convert to lower case for comparison
@@ -52 +52 @@
                                 is2d=0
                 else:
-                        raise ValueError('processmesh error: dim = %d not supported')
+                        raise ValueError('processmesh error: dim = %d not supported' % md.mesh.dimension)
 
                 #layer projection?
@@ -58 +58 @@
                          if 'latlon' in options.getfieldvalue('coord','xy').lower():
                                  raise ValueError('processmesh error: cannot work with 3D mesh in lat-lon coords')
-                        #we modify (w/c?) the mesh temporarily to a 2D mesh from which the 3D mesh was extruded
+                        #we modify the mesh temporarily to a 2D mesh from which the 3D mesh was extruded
                          x=x2d
                          y=y2d
@@ -65 +65 @@
         
         else:
-                #Process mesh for plotting (triangulation for 2D, polycollection for 3D?)
+                #Process mesh for plotting 
                 if md.mesh.dimension==2:
                         is2d=1
@@ -79 +79 @@
                 z=z*unit
 
-        ##is model a member of planet class? (won't work until planet class defined)
-        #if isinstance(md,planet):
-        #       isplanet=1
-        #else:
-        #       isplanet=0
-        return x,y,z,elements,is2d
+        #is model a member of planet class? (workaround until planet class defined)
+        if md.__class__.__name__!='model':
+                isplanet=1
+        else:
+                isplanet=0
+
+        return x,y,z,elements,is2d,isplanet