Changeset 13417

Timestamp:

09/21/12 17:47:14 (12 years ago)

Author:

cborstad

Message:

NEW: processmesh and applyoptions for python plotting, some options enabled

Location:

issm/trunk-jpl/src/m

Files:

• classes/plotoptions.py (modified) (1 diff)
• plot/applyoptions.py (added)
• plot/plot_mesh.py (modified) (2 diffs)
• plot/plotmodel.py (modified) (3 diffs)
• plot/processmesh.py (added)

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

@@ -93 +93 @@
                                         if not plotnum: continue
 
+                                        # '#all'
                                         elif 'all' in plotnum:
                                                 for j in xrange(numberofplots):
                                                         self.list[j].addfield(field,rawlist[i][1])
 
+                                        # '#i-j'
                                         elif '-' in plotnum:
                                                 nums=plotnum.split('-')

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

@@ -1 +1 @@
 import pylab as p
-import matplotlib.tri as tri
+from processmesh import processmesh
+from applyoptions import applyoptions
 
 def plot_mesh(md,options,nlines,ncols,i):
@@ -12 +13 @@
         '''
 
-        #TODO: implement processmesh
-        x=md.mesh.x
-        y=md.mesh.y
-        elements=md.mesh.elements
-        elements=elements-1 #since python indexes from zero
+        x,y,z,elements,is2d=processmesh(md,[],options)
 
-        p.subplot(nlines,ncols,i)
-        p.triplot(x,y,elements)
-        p.title('Mesh')
+        if is2d:
+                p.subplot(nlines,ncols,i)
+                p.triplot(x,y,elements)
+        else:
+                print 'WARNING: only 2D mesh plot is currently implemented'
         
-        print 'WARNING: options passed to plot_mesh not implemented yet'
+        #apply options
+        options.addfielddefault('title','Mesh')
+        applyoptions(md,[],options)

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

@@ -1 +1 @@
 import pylab as p
 #from pairoptions import *
-from plotoptions import *
-from plot_manager import *
+from plotoptions import plotoptions
+from plot_manager import plot_manager
+from math import ceil, sqrt
 
 def plotmodel(md,*args):
@@ -13 +14 @@
 
         #get number of subplots
-        subplotwidth=math.ceil(math.sqrt(options.numberofplots))
+        subplotwidth=ceil(sqrt(options.numberofplots))
         
         #if nlines and ncols specified, then bypass
@@ -44 +45 @@
                 #plots will be visible by default if ipython is run in interactive mode (invoked by ipython --pylab)
                 #handling the 'visible' option will need some check on whether ipython is currently in interactive or non-interactive mode
-                p.figure(figurenumber)
+
+                #if figsize specified
+                if options.list[0].exist('figsize'):
+                        figsize=options.list[0].getfieldvalue('figsize')
+                        p.figure(figurenumber,figsize=figsize)
+                else:
+                        p.figure(figurenumber)
+
         
-                try:
-                        for i in xrange(numberofplots):
-                                plot_manager(options.list[i].getfieldvalue('model',md),options.list[i],subplotwidth,nlines,ncols,i)
-                except StandardError:
-                        print 'error in plot_manager'
+                #try:
+                for i in xrange(numberofplots):
+                        plot_manager(options.list[i].getfieldvalue('model',md),options.list[i],subplotwidth,nlines,ncols,i)
+                #except StandardError:
+                #       print 'error in plot_manager'
         else:
                 raise StandardError('plotmodel error message: no output data found.')