Changeset 2608 in lmdz_wrf

Timestamp:

Jun 17, 2019, 4:53:10 AM (5 years ago)

Author:

lfita

Message:

Almost there? Not fully working cut_x

File:

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

trunk/tools/geometry_tools.py

@@ -467 +467 @@
 
     return btw
+
+def add_secpolygon_list(listv, iip, eep, polygon):
+    """ Function to add a range of points of a polygon into a list
+      listv: list into which add values of the polygon
+      iip: initial value of the range
+      eep: ending value of the range
+      polygon: array with the points of the polygon
+    """
+    fname = 'add_secpolygon_list'
+
+    if eep > iip:
+        for ip in range(iip,eep): listv.append(polygon[ip,:])
+    else:
+        for ip in range(iip,eep,-1): listv.append(polygon[ip,:])
+
+    return
 
 def cut_ypolygon(polygon, yval, keep='below', Nadd=20):
@@ -881 +897 @@
         Ncpts.append(ecut[ic] - icut[ic])
 
-    cutpolygon = np.ones((Ntotpts+Ncuts,2), dtype=np.float)*gen.fillValue
+    cutpolygon = []
 
     iipc = 0
@@ -888 +904 @@
         if keep == 'left':
             if ic == 0:
-                cutpolygon[0:icut[ic],:] = polygon[0:icut[ic],:]
+                add_secpolygon_list(cutpolygon,0,icut[ic],polygon)
                 iipc = icut[ic]
             else:
-                cutpolygon[iipc:iipc+dcpt-1,:] = polygon[icut[ic]+1:ecut[ic],:]
+                add_secpolygon_list(cutpolygon,icut[ic]+1,ecut[ic],polygon)
+                #cutpolygon[iipc:iipc+dcpt-1,:] = polygon[icut[ic]+1:ecut[ic],:]
                 iipc = iipc + dcpt -1
         else:
-            cutpolygon[iipc,:] = ipt[ic]
-            cutpolygon[iipc:iipc+dcpt-1,:]=polygon[icut[ic]+1:ecut[ic],:]
+            cutpolygon.append(ipt[ic])
+            add_secpolygon_list(cutpolygon,icut[ic]+1,ecut[ic],polygon)
+            #cutpolygon[iipc:iipc+dcpt-1,:]=polygon[icut[ic]+1:ecut[ic],:]
             iipc = iipc+dcpt-1
 
@@ -906 +924 @@
             cutline[ip,:] = ipt[ic] + np.array([dy*ip,dx*ip])
         cutline[Nadds[ic]-1,:] = ept[ic]
+        print 'Lluis ipt0', ipt[ic], 'cutline[Nadds-ic,:]', cutline[Nadds[ic]-1,:], 'ept', ept[ic]
         if keep == 'left':
-            if ic == 0: cutpolygon[iipc:iipc+Nadds[ic],:] = cutline
-            else: cutpolygon[iipc:iipc+Nadds[ic],:] = cutline[::-1]
+            if ic == 0: 
+                for ip in range(Nadds[ic]): cutpolygon.append(cutline[ip,:])
+            else: 
+                for ip in range(Nadds[ic]-1,0,-1): cutpolygon.append(cutline[ip,:])
             iipc = iipc+Nadds[ic]
             if ic == 0:
-                cutpolygon[iipc:iipc+N-ecut[ic]-1,:] = polygon[ecut[ic]+1:N,:]
-                iipc = iipc + N-ecut[ic]-1
-                cutpolygon[iipc,:] = polygon[0,:]
+#                cutpolygon[iipc:iipc+N-ecut[ic]-1,:] = polygon[ecut[ic]+1:N,:]
+#                iipc = iipc + N-ecut[ic]-1
+                add_secpolygon_list(cutpolygon,ecut[ic]-2,N,polygon)
+                #cutpolygon[iipc:iipc+N-ecut[ic]+2,:] = polygon[ecut[ic]-2:N,:]
+                iipc = iipc + N-ecut[ic]+2
+                cutpolygon.append(polygon[0,:])
                 iipc = iipc + 1
         else:
-            cutpolygon[iipc:iipc+Nadds[ic],:] = cutline[::-1,:]
+            for ip in range(Nadds[ic]-1,0,-1): cutpolygon.append(cutline[ip,:])
             iipc = iipc+Nadds[ic]
+        cutpolygon.append([gen.fillValueF, gen.fillValueF])
         iipc = iipc + 1
 
+    cutpolygon = np.array(cutpolygon)
     rmpolygon = []
     Npts = cutpolygon.shape[0]
@@ -1318 +1344 @@
         ept = cutvs[3]
         Ncuts = cutvs[4]
-        if Ncuts > 1:
+        if Ncuts > 0:
             # Re-shifting cuts by closest heigth.
             yis = []
@@ -1362 +1388 @@
         cutv = cuts[icc]
         Ncuts = cutv[4]
-        print '  icc:', icc, 'ic ec ipt ept _______'
-        for ic in range(Ncuts):
-            print ic, ':', cutv[0][ic], cutv[1][ic], cutv[2][ic], cutv[3][ic]
+        if Ncuts == 0:
+            print errormsg
+            print '  ' + fname + ": no cuts for xval=", xvals[icc], '!!'
+            quit(-1)
+        #print '  icc:', icc, 'ic ec ipt ept _______'
+        #for ic in range(Ncuts):
+        #    print ic, ':', cutv[0][ic], cutv[1][ic], cutv[2][ic], cutv[3][ic]
 
         # Length of joining lines
@@ -1399 +1429 @@
             for ic in range(Ncuts-1):
                 cutpolygon.append(ipt[ic])
-                if ic == 0:
-                    for ip in range(icut[ic],N-1): cutpolygon.append(polygon[ip,:])
-                for ip in range(icut[ic],ecut[ic]): cutpolygon.append(polygon[ip,:])
-                # line
-                print 'Lluis ept', ept[ic], 'ipt+1', ipt[ic+1], 'Nadds:', Nadds[ic]
-                dx = (ipt[ic+1][1] - ept[ic][1])/(Nadds[ic]-1)
-                dy = (ipt[ic+1][0] - ept[ic][0])/(Nadds[ic]-1)
+                dx = (ept[ic][1] - ipt[ic][1])/(Nadds[ic]-1)
+                dy = (ept[ic][0] - ipt[ic][0])/(Nadds[ic]-1)
                 for ip in range(1,Nadds[ic]-1):
-                    cutpolygon.append([ept[ic][0]+dy*ip, ept[ic][1]+dy*ip])
+                    cutpolygon.append([ipt[ic][0]+dy*ip, ipt[ic][1]+dx*ip])
+                cutpolygon.append(ept[ic])
+                for ip in range(ecut[ic]+1,icut[ic+1]): cutpolygon.append(polygon[ip,:])
+
+            print 'Lluis ', Ncuts, 'ic', Ncuts-1
             ic = Ncuts-1
-            print ic, 'final', iic,' :', icut[ic], ecut[ic]
-            for ip in range(icut[ic],ecut[ic]): cutpolygon.append(polygon[ip,:])
+            cutpolygon.append(ipt[ic])
+            dx = (ept[ic][1] - ipt[ic][1])/(Nadds[ic]-1)
+            dy = (ept[ic][0] - ipt[ic][0])/(Nadds[ic]-1)
+            for ip in range(1,Nadds[ic]-1):
+                cutpolygon.append([ipt[ic][0]+dy*ip, ipt[ic][1]+dx*ip])
         # right side
         else:
@@ -1416 +1448 @@
                 cutpolygon.append(ipt[ic])
 
-                for ip in range(icut[ic],ecut[ic]): cutpolygon.append(polygon[ip,:])
                 # line
-                dx = (ipt[ic+1][1] - ept[ic][1])/(Nadds[ic]-1)
-                dy = (ipt[ic+1][0] - ept[ic][0])/(Nadds[ic]-1)
+                dx = (ept[ic][1] - ipt[ic][1])/(Nadds[ic]-1)
+                dy = (ept[ic][0] - ipt[ic][0])/(Nadds[ic]-1)
                 for ip in range(1,Nadds[ic]-1):
-                    cutpolygon.append([ept[ic,0]+dy*ip, ept[ic,0]+dy*ip])
+                    cutpolygon.append([ipt[ic][0]+dy*ip, ipt[ic][1]+dx*ip])
+                cutpolygon.append(ept[ic])
+                for ip in range(ecut[ic],icut[ic+1]): cutpolygon.append(polygon[ip,:])
+
             ic = Ncuts-1
-            for ip in range(icut[ic],ecut[ic]): cutpolygon.append(polygon[ip,:])
-            for ip in range(ecut[ic],N-1): cutpolygon.append(polygon[ip,:])
+            cutpolygon.append(ipt[ic])
+            # line
+            dx = (ept[ic][1] - ipt[ic][1])/(Nadds[ic]-1)
+            dy = (ept[ic][0] - ipt[ic][0])/(Nadds[ic]-1)
+            for ip in range(1,Nadds[ic]-1):
+                cutpolygon.append([ipt[ic][0]+dy*ip, ipt[ic][1]+dx*ip])
+            cutpolygon.append(ept[ic])
         sides[iic] = cutpolygon
-        for ip in range(len(cutpolygon)): iic, ip, ':', cutpolygon[ip]
         
     # joining sides by e1[Ncuts1-1] --> i2[0]; e2[Ncuts2-1] --> i1[0]
     cutv1 = cuts[0]
     Ncuts1 = cutv1[4]
-    ec1 = cutv1[1][Ncuts1-1]
+    ec1 = cutv1[1][np.max([0,Ncuts1-1])]
     ic1 = cutv1[0][0]
-    ept1 = cutv1[3][Ncuts1-1]
+    ept1 = cutv1[3][np.max([0,Ncuts1-1])]
     ipt1 = cutv1[2][0]
 
-    cutv2 = cuts[0]
+    cutv2 = cuts[1]
     Ncuts2 = cutv2[4]
-    ec2 = cutv2[1][Ncuts1-1]
+    ec2 = cutv2[1][np.max([0,Ncuts2-1])]
     ic2 = cutv2[0][0]
-    ept2 = cutv2[3][Ncuts1-1]
+    ept2 = cutv2[3][np.max([0,Ncuts2-1])]
     ipt2 = cutv2[2][0]
 
     finalcutpolygon = sides[0]
-    for ip in range(ec1,ic2): finalcutpolygon.append(polygon[ip,:])
+    for ip in range(ec1+1,ic2): finalcutpolygon.append(polygon[ip,:])
     finalcutpolygon = finalcutpolygon + sides[1]
-    for ip in range(ec2,ic1): finalcutpolygon.append(polygon[ip,:])
-
+    for ip in range(ec2+1,ic1): finalcutpolygon.append(polygon[ip,:])
+    finalcutpolygon.append(ipt1)
 
     finalcutpolygon = np.array(finalcutpolygon)
@@ -3414 +3452 @@
     buoydic = {'buoy': [buoy[0:N2,:],'-','#FFFF00',1.5],                             \
       'sign': [buoy[N2+1:N,:],'-','#FFFF00',1.5],'fifth1':[fifth1,'-','#FFFF00',1.5],\
-      'fifth2': [fifth2,'-','#FFFF00',1.5],'fifth3': [fifth3,'-','#0000FF',1.5],     \
-      'fifth4': [fifth4,'-','#FFFF00',1.5],'fifth5': [fifth5,'-','#0000FF',1.5]}
+      'fifth2': [fifth2,'-','#0000FF',1.5],'fifth3': [fifth3,'-','#FFFF00',1.5],     \
+      'fifth4': [fifth4,'-','#0000FF',1.5],'fifth5': [fifth5,'-','#FFFF00',1.5]}
 
     return buoy, buoysecs, buoydic
@@ -3566 +3604 @@
     if drwxline:
         ax.plot([xline[0,0],xline[1,0]], [xline[0,1],xline[1,1]],                    \
-          [xline[0,2],xline[1,2]], linev[0], color=linev[1], linewidth=linev[2],  label='xline')
+          [xline[0,2],xline[1,2]], linev[0], color=linev[1], linewidth=linev[2],     \
+          label='xline')
 
     # y line
@@ -3572 +3611 @@
     if drwyline:
         ax.plot([yline[0,0],yline[1,0]], [yline[0,1],yline[1,1]],                    \
-          [yline[0,2],yline[1,2]], linev[0], color=linev[1], linewidth=linev[2],  label='yline')
+          [yline[0,2],yline[1,2]], linev[0], color=linev[1], linewidth=linev[2],     \
+          label='yline')
 
     # z line
@@ -3578 +3618 @@
     if drwzline:
         ax.plot([zline[0,0],zline[1,0]], [zline[0,1],zline[1,1]],                    \
-          [zline[0,2],zline[1,2]], linev[0], color=linev[1], linewidth=linev[2],  label='zline')
+          [zline[0,2],zline[1,2]], linev[0], color=linev[1], linewidth=linev[2],     \
+          label='zline')
 
     plt.legend()
@@ -3597 +3638 @@
         pvals = secvals[0]
         fillsec = []
-        for ip in range(pvals.shape[0]):
-            if type(pvals[ip,0]) != type(gen.mamat[1]) and type(pvals[ip,1]) != type(gen.mamat[1]): 
+        Nvals = pvals.shape[0]
+        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])
+#        plt.fill(pvals[:,1], pvals[:,0], color=secvals[2])
         fillsec = np.array(fillsec)
         plt.fill(fillsec[:,1], fillsec[:,0], color=secvals[2])