Changeset 21611

Timestamp:

03/14/17 07:55:57 (8 years ago)

Author:

bdef

Message:

BUG:fixing segmentation fault with masked NaNs

Location:

issm/trunk-jpl/src/m/plot

Files:

• plot_icefront.py (modified) (2 diffs)
• plot_unit.py (modified) (2 diffs)

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

@@ -22 +22 @@
         noice=np.where(np.sum(md.mask.ice_levelset[elements],1)==3)
 
-        #hydro neumann
-        hydro_neumann=np.where(md.hydrology.neumannflux!=0)
         #plot mesh
         ax.triplot(x,y,elements)
@@ -31 +29 @@
                 colors=np.asarray([0.5 for element in elements[icefront]])
                 ax.tripcolor(x,y,elements[icefront],facecolors=colors,alpha=0.5,label='elements on ice front')
-        if len(hydro_neumann[0])>0:
-                colors=np.asarray([0.5 for element in elements[hydro_neumann]])
-                ax.tripcolor(x,y,elements[hydro_neumann],facecolors=colors,alpha=0.5,label='non zero neumann flux for the hydrology')
 
         #apply options

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

@@ -147 +147 @@
         elif datatype==2:
                 if is2d:
-                        if options.exist('mask'):
+                        if np.ma.is_masked(data):
                                 EltMask=np.asarray([np.any(np.in1d(index,np.where(data.mask))) for index in elements])
                                 triangles=mpl.tri.Triangulation(x,y,elements,EltMask)
@@ -193 +193 @@
                         ax.set_ylim([min(y),max(y)])
                         ax.set_zlim([min(z),max(z)])
-
                         #raise ValueError('plot_unit error: 3D element plot not supported yet')
                 return