Changeset 2578 in lmdz_wrf for trunk/tools/geometry_tools.py

Timestamp:

Jun 1, 2019, 9:03:10 PM (5 years ago)

Author:

lfita

Message:

Adding 'emergency_buoy' ...

File:

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

trunk/tools/geometry_tools.py

@@ -813 +813 @@
                     if eep == N: eep = 0
       
-                    if polygon[ip,1] <= xval and polygon[eep,1] >= xval:
+                    if (polygon[ip,1] <= xval and polygon[eep,1] > xval) or          \
+                      (polygon[ip,1] < xval and polygon[eep,1] >= xval):
                         icut[ic] = ip
                         dx[ic] = polygon[eep,1] - polygon[ip,1]
@@ -820 +821 @@
                         ipt[ic,:] = [polygon[ip,0]+dy[ic]*dd/dx[ic], xval]
 
-                    if polygon[ip,1] >= yval and polygon[eep,1] <= xval:
+                    if (polygon[ip,1] >= yval and polygon[eep,1] < xval) or          \
+                      (polygon[ip,1] > yval and polygon[eep,1] <= xval):
                         ecut[ic] = ip
                         dx[ic] = polygon[eep,1] - polygon[ip,1]
@@ -832 +834 @@
                 if eep == N: eep = 0
       
-                if polygon[ip,1] <= xval and polygon[eep,1] >= xval:
+                if (polygon[ip,1] <= xval and polygon[eep,1] > xval) or              \
+                  (polygon[ip,1] < xval and polygon[eep,1] >= xval):
                     icut[ic] = ip
                     dx[ic] = polygon[eep,1] - polygon[ip,1]
@@ -841 +844 @@
                     ipt[ic,:] = [polygon[ip,0]+dy[ic]*dd/dx[ic], xval]
 
-                if polygon[ip,1] >= xval and polygon[eep,1] <= xval:
+                if (polygon[ip,1] >= xval and polygon[eep,1] < xval) or              \
+                  (polygon[ip,1] > xval and polygon[eep,1] <= xval):
                     ecut[ic] = ip
                     dx[ic] = polygon[eep,1] - polygon[ip,1]
                     dy[ic] = polygon[eep,0] - polygon[ip,0]
                     dd = xval - polygon[ip,1]
-                    ept[ic,:] = [polygon[ip,0]+dy[ic]*dd/dx[ic], xval]
+                    if dx[ic] == 0.:
+                        ept[ic,:] = [polygon[eep,0], xval]
+                    else:
+                        ept[ic,:] = [polygon[ip,0]+dy[ic]*dd/dx[ic], xval]
 
         if ipt is None or ept is None:
@@ -2668 +2675 @@
     lsign = height*hsigns
     # up
-    cross, crosssecs, crossdic = p_cross_width(lsign, width=0.2*lsign, Narms=2, N=N3)
+    cross, crosssecs, crossdic = p_cross_width(lsign, width=0.3*lsign, Narms=2, N=N3)
     cross = rotate_polygon_2D(cross, 40.05)
     buoy[N2+1:N,:] = cross + [Height+1.1*lsign,0.]
@@ -2709 +2716 @@
     lsign = height*hsigns
     # up
-    cross, crosssecs, crossdic = p_cross_width(lsign, width=0.2*lsign, Narms=2, N=N3)
+    cross, crosssecs, crossdic = p_cross_width(lsign, width=0.3*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')
+    ix = -width/2.
+    Ncut, fifth1 = cut_xpolygon(buoy1v, xval=ix+width/5., keep='left')
+    Ncut, fifth2 = cut_between_xpolygon(buoy1v,xval1=ix+width/5.,xval2=ix+width*2./5.)
+    Ncut, fifth3 = cut_between_xpolygon(buoy1v,xval1=ix+width*2./5.,xval2=ix+width*3./5.)
+    Ncut, fifth4 = cut_between_xpolygon(buoy1v,xval1=ix+width*3./5.,xval2=ix+width*4./5.)
+    Ncut, fifth5 = cut_xpolygon(buoy1v, xval=ix+width*4./5., keep='right')
 
     buoy = ma.masked_equal(buoy, gen.fillValueF)
 
-    buoysecs = ['buoy', 'sign']
+    buoysecs = ['buoy', 'sign', 'fifth1', 'fifth2', 'fifth3', 'fifth4', 'fifth5']
     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]}
+      '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]}
 
     return buoy, buoysecs, buoydic