Changeset 2577 in lmdz_wrf

Timestamp:

Jun 1, 2019, 8:29:34 PM (6 years ago)

Author:

lfita

Message:

Avoiding point repetition in `buoy1'

File:

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

trunk/tools/geometry_tools.py

@@ -837 +837 @@
                     dy[ic] = polygon[eep,0] - polygon[ip,0]
                     dd = xval - polygon[ip,1]
+                    print 'Lluis ip', ip, 'poly:', polygon[ip,:], 'xval:', xval, 'ip+1', polygon[eep,:]
+                    print '  dx:', dx, 'dy:', dy, 'dd', dd
                     ipt[ic,:] = [polygon[ip,0]+dy[ic]*dd/dx[ic], xval]
 
@@ -861 +863 @@
 
     for ic in range(2):
+        print ic, 'Lluis ipt:', ipt[ic,:], 'ept:', ept[ic,:]
         dx = (ept[ic,1] - ipt[ic,1])/(Nadd2-2)
         dy = (ept[ic,0] - ipt[ic,0])/(Nadd2-2)
+        print '    dx:', dx, 'dy', dy
         cutlines[ic,0,:] = ipt[ic,:]
         for ip in range(1,Nadd2-1):
@@ -1848 +1852 @@
     iy = 0.
     dx = 0.
-    dy = height/(Np-1)
+    dy = height/(Np)
     for ip in range(Np):
         buoy[iip+ip,:] = [iy+dy*ip,ix+dx*ip]
@@ -1857 +1861 @@
     ix = -width/2.
     iy = height
-    dx = (width/2.-bradii*bfrac)/(Np-1)
+    dx = (width/2.-bradii*bfrac)/(Np)
     dy = 0.
     for ip in range(Np):
@@ -1876 +1880 @@
     iy = height
     Np = N3
-    dx = (width/2.-bradii*bfrac)/(Np-1)
+    dx = (width/2.-bradii*bfrac)/(Np)
     dy = 0.
     for ip in range(Np):
@@ -1887 +1891 @@
     iy = height
     dx = 0.
-    dy = -height/(Np-1)
+    dy = -height/(Np)
     for ip in range(Np):
         buoy[iip+ip,:] = [iy+dy*ip,ix+dx*ip]
@@ -1896 +1900 @@
     ix = width/2.
     iy = 0.
-    Np = N - int(2*N/3) - 4*N3
-    dx = -width/(Np-1)
+    Np = N - int(2*N/3) - 4*N3 - 1
+    dx = -width/(Np)
     dy = 0.
     for ip in range(Np):
@@ -1903 +1907 @@
     NNp = NNp + Np
     iip = NNp
+
+    buoy[N-1,:] = buoy[0,:]
 
     buoysecs = ['base']
@@ -2675 +2681 @@
     return buoy, buoysecs, buoydic
 
+def emergency_buoy1(height=5., width=10., bradii=1.75, bfrac=0.8, hsigns=0.5, N=300):
+    """ Function to draw an eergency mark buoy using buoy1
+      height: height of the prism (5., default) 
+      width: width of the prism (10., default)
+      bradii: radii of the ball (1.75, default)
+      bfrac: fraction of the ball above the prism (0.8, default)
+      hisgns: height of the signs [as reg. triangle] as percentage of the height 
+        (0.5, default)
+      N: total number of points of the buoy (300, default)
+    """
+    fname = 'emergency_buoy1'
+
+    buoy = np.ones((N,2), dtype=np.float)*gen.fillValueF
+
+    # buoy
+    N2 = int(N/2)
+    buoy1v, buoy1vsecs, buoy1vdic = buoy1(height=5., width=10., bradii=1.75,         \
+      bfrac=0.8, N=N2)
+    buoy[0:N2,:] = buoy1v
+
+    Height = np.max(buoy1v[:,0])
+
+    # sign
+    N3 = N - N2 - 1
+    
+    bottsigns = 2.*bradii+height
+    lsign = height*hsigns
+    # up
+    cross, crosssecs, crossdic = p_cross_width(lsign, width=0.2*lsign, Narms=2, N=N3)
+    buoy[N2+1:N,:] = cross + [Height+1.1*lsign,0.]
+
+    # painting it
+    Ncut, quart1 = cut_xpolygon(buoy1v, xval=width/4., keep='left')
+    Ncut, quart2 = cut_between_xpolygon(buoy1v, xval1=width/4., xval2=width/2)
+    Ncut, quart3 = cut_between_xpolygon(buoy1v, xval1=width/2., xval2=width*3./4.)
+    Ncut, quart4 = cut_xpolygon(buoy1v, xval=width*3./4., keep='right')
+
+    buoy = ma.masked_equal(buoy, gen.fillValueF)
+
+    buoysecs = ['buoy', 'sign']
+    buoydic = {'buoy': [buoy[0:N2,:],'-','#FFFF00',1.5],                             \
+      'sign': [buoy[N2+1:N,:],'-','#FFFF00',1.5],'quart1':[quart1,'-','#0000FF',1.5],\
+      'quart2': [quart2,'-','#FFFF00',1.5],'quart3': [quart3,'-','#0000FF',1.5],     \
+      'quart4': [quart4,'-','#FFFF00',1.5]}
+
+    return buoy, buoysecs, buoydic
+
 ####### ####### ##### #### ### ## #
 # Plotting