Changeset 2611 in lmdz_wrf for trunk/tools

Timestamp:

Jun 18, 2019, 3:11:29 AM (6 years ago)

Author:

lfita

Message:

Adding to `paint_filled' the removal of the masked values by re-slicing

File:

• trunk/tools/geometry_tools.py (modified) (3 diffs)

trunk/tools/geometry_tools.py

@@ -1452 +1452 @@
                 for ip in range(ecut[ic]+1,icut[ic+1]): cutpolygon.append(polygon[ip,:])
 
-            print 'Lluis ', Ncuts, 'ic', Ncuts-1
             ic = Ncuts-1
             cutpolygon.append(ipt[ic])
@@ -1504 +1503 @@
 
     finalcutpolygon = np.array(finalcutpolygon)
+
+    finalcutpolygon = rm_consecpt_polygon(finalcutpolygon)
     finalcutpolygon = ma.masked_equal(finalcutpolygon, gen.fillValueF)
 
@@ -3653 +3654 @@
         secvals=objdic[secn]
         pvals = secvals[0]
-        fillsec = []
+        fillsecs = []
         Nvals = pvals.shape[0]
+        # re-sectionning to plot without masked values
         for ip in range(Nvals-1):
-            if type(pvals[ip][0]) != type(gen.mamat[1]) and type(pvals[ip+1][0]) != type(gen.mamat[1]): 
-                fillsec.append(pvals[ip,:])
-#        plt.fill(pvals[:,1], pvals[:,0], color=secvals[2])
-        fillsec = np.array(fillsec)
-        plt.fill(fillsec[:,1], fillsec[:,0], color=secvals[2])
+            if type(pvals[ip][0]) == type(gen.mamat[1]): fillsecs.append(ip) 
+        Nsecs = len(fillsecs)
+        iisc = 0
+        for isc in range(Nsecs):
+            plt.fill(pvals[iisc:fillsecs[isc],1], pvals[iisc:fillsecs[isc],0],       \
+              color=secvals[2])
+            iisc = fillsecs[isc]+1
+        plt.fill(pvals[iisc:Nvals-1,1], pvals[iisc:Nvals-1,0], color=secvals[2])
 
     return