Changeset 2548 in lmdz_wrf

Timestamp:

May 19, 2019, 5:23:54 PM (6 years ago)

Author:

lfita

Message:

Final working version of cut_ypolygon' and nort_buoy1'

File:

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

trunk/tools/geometry_tools.py

@@ -466 +466 @@
                     dd = yval - polygon[ip,0]
                     print polygon[ip,:], ':', polygon[eep,:]
-                    print 'dx', dx, 'dy', dy, 'dd', dd
                     ept = [yval, polygon[ip,1]+dx*dd/dy]
     else:
@@ -486 +485 @@
                 dy = polygon[eep,0] - polygon[ip,0]
                 dd = yval - polygon[ip,0]
-                print polygon[ip,:], ':', polygon[eep,:]
-                print 'dx', dx, 'dy', dy, 'dd', dd
                 ept = [yval, polygon[ip,1]+dx*dd/dy]
-
-    print 'Lluis ipt:', ipt, 'ept:', ept
 
     if ipt is None or ept is None:
@@ -500 +495 @@
         cutpolygon = np.zeros((Npts,2), dtype=np.float)
         if type(polygon) == type(gen.mamat):
-            cutpolygon[0:icut+1,:] = polygon[0:icut+1,:].filled(gen.fillValueF)
+            cutpolygon[0:icut+1,:] = polygon[0:icut+1,:]
         else:
             cutpolygon[0:icut+1,:] = polygon[0:icut+1,:]
@@ -507 +502 @@
         Npts = ecut - icut + Nadd-1
         cutpolygon = np.zeros((Npts,2), dtype=np.float)
-        if type(polygon) == type(gen.mamat):
-            cutpolygon[0:ecut-icut-1,:] = polygon[icut+1:ecut,:].filled(gen.fillValueF)
-        else:
-            cutpolygon[0:ecut-icut-1,:] = polygon[icut+1:ecut,:]
+        cutpolygon[0,:] = ipt
+        cutpolygon[1:ecut-icut,:] = polygon[icut+1:ecut,:]
         iip = ecut-icut-1
 
@@ -524 +517 @@
     if keep == 'bottom':
         if type(polygon) == type(gen.mamat):
-            cutpolygon[iip+Nadd:Npts,:] = polygon[ecut+1:N,:].filled(gen.fillValueF)
+            cutpolygon[iip+Nadd:Npts,:] = polygon[ecut+1:N,:]
         else:
             cutpolygon[iip+Nadd:Npts,:] = polygon[ecut+1:N,:]
@@ -530 +523 @@
     rmpolygon = []
     if keep == 'bottom':
-        for ip in range(N):
-            if polygon[ip,0] > yval:
+        for ip in range(Npts):
+            if cutpolygon[ip,0] > yval:
                 rmpolygon.append([gen.fillValueF, gen.fillValueF])
             else:
-                rmpolygon.append(polygon[ip,:])
+                rmpolygon.append(cutpolygon[ip,:])
     else:
-        for ip in range(N):
-            if polygon[ip,0] < yval:
+        for ip in range(Npts):
+            if cutpolygon[ip,0] < yval:
                 rmpolygon.append([gen.fillValueF, gen.fillValueF])
             else:
-                rmpolygon.append(polygon[ip,:])
+                rmpolygon.append(cutpolygon[ip,:])
     Npts = len(rmpolygon)
     cutpolygon = np.array(rmpolygon)
@@ -1664 +1657 @@
     # buoy
     N2 = int(N/2)
-    buoy1v, buoy1vsecs, buoy1vdic = buoy1(height=5., width=10., bradii=1.75, bfrac=0.8, N=N2)
+    buoy1v, buoy1vsecs, buoy1vdic = buoy1(height=5., width=10., bradii=1.75,         \
+      bfrac=0.8, N=N2)
     buoy[0:N2,:] = buoy1v
 
@@ -1685 +1679 @@
     buoy[N2+N32+2:N,:] = trib + [bottsigns+1.1*lsign,0.]
 
+    # painting it
+    Height = np.max(buoy1v[:,0])
+
+    print 'Lluis Height', Height
+
+    Ncut, halfdown = cut_ypolygon(buoy1v, yval=Height/2., keep='bottom')
+    Ncut, halfup = cut_ypolygon(buoy1v, yval=Height/2., keep='above')
+
     buoy = ma.masked_equal(buoy, gen.fillValueF)
 
-    buoysecs = ['buoy', 'sign1', 'sign2']
+    buoysecs = ['buoy', 'sign1', 'sign2', 'halfk', 'halfy']
     buoydic = {'buoy': [buoy[0:N2,:],'-','k',1.5],                                   \
       'sign1': [buoy[N2+1:N2+N32+1,:],'-','k',1.5],                                  \
-      'sign2': [buoy[N2+N32+2:N,:],'-','k',1.5]}
-
-    # painting it
-    Height = height + 1.8*bradii
-#    print 'Lluis Height', Height
-#    Ncut, halfdown = cut_ypolygon(buoy, yval=Height/2., keep='bottom')
-#    Ncut, halfup = cut_ypolygon(buoy, yval=Height/2., keep='above')
-
-#    buoysecs.append('halfk')
-#    buoydic['halfk'] = [halfup, '-', 'k', 1.]
-#    buoysecs.append('halfy')
-#    buoydic['halfy'] = [halfdown, '-', '#FFFF00', 1.]
+      'sign2': [buoy[N2+N32+2:N,:],'-','k',1.5], 'halfk': [halfup, '-', 'k', 1.],    \
+      'halfy': [halfdown, '-', '#FFFF00', 1.]}
 
     return buoy, buoysecs, buoydic