Changeset 2530 in lmdz_wrf

Timestamp:

May 12, 2019, 12:01:05 AM (6 years ago)

Author:

lfita

Message:

Improving lighthouse

File:

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

trunk/tools/geometry_tools.py

@@ -1245 +1245 @@
 
     Ntower = iip-1
-    lighthousesecs = ['tower']
+    lighthousesecs.append('tower')
     lighthousedic['tower'] = [lighthouse[0:iip-1], '-', 'k', 1.5]
 
     # Left light
-    p1 = np.array([height, -width/2.])
-    p2 = np.array([height+hlight, 0.])
+    p1 = np.array([height, -width*0.8/2.])
+    p2 = np.array([height+hlight, -width*0.8/2.])
     lighthouse[iip:iip+Nsec,:] = circ_sec(p1, p2, 3*hlight, Nang=Nsec)
     iip = iip + Nsec
     
+    # Top Light
+    p1=np.array([height+hlight, width*0.8/2.])
+    p2=np.array([height+hlight, -width*0.8/2.])
+    lighthouse[iip:iip+Nsec,:] = circ_sec(p1, p2, 3*width, pos='left', Nang=Nsec)
+    iip = iip + Nsec + 1
+
     # Right light
-    p1 = np.array([height+hlight, 0.])
-    p2 = np.array([height, width/2.])
+    p1 = np.array([height+hlight, width*0.8/2.])
+    p2 = np.array([height, width*0.8/2.])
     lighthouse[iip:iip+Nsec,:] = circ_sec(p1, p2, 3*hlight, Nang=Nsec)
     iip = iip + Nsec
 
     # Base Light
-    p1=np.array([height, width/2.])
-    p2=np.array([height, -width/2.])
+    p1=np.array([height, width*0.8/2.])
+    p2=np.array([height, -width*0.8/2.])
     lighthouse[iip:iip+Nsec,:] = circ_sec(p1, p2, 3*width, pos='left', Nang=Nsec)
     iip = iip + Nsec + 1
-    lighthousesecs = ['light']
-    lighthousedic['light'] = [lighthouse[Ntower+1:iip-1], '-', '#AAAA00', 1.5]
+    lighthousesecs.append('light')
+    lighthousedic['light'] = [lighthouse[Ntower+1:iip-1], '-', '#EEEE00', 1.5]
 
     # Spiral bands
     hb = height/(2.*bands)
-    Nsec2 = (N - Nsec*7 - 3)/bands
+    Nsec2 = (N - Nsec*8 - 3)/bands
     for ib in range(bands-1):
         iband = iip
@@ -1301 +1307 @@
         lighthouse[iip:iip+Nsec,:] = circ_sec(p1, p2, 3*width, pos='left', Nang=Nsec)
         iip = iip + Nsec + 1
-        lighthousesecs = [bandS]
-        lighthousedic[bandS] = [lighthouse[iband:iip-1], '-', '#160016', 2.]
+        lighthousesecs.append(bandS)
+        lighthousedic[bandS] = [lighthouse[iband:iip-1], '-', '#6408AA', 2.]
 
     ib = bands-1
@@ -1335 +1341 @@
     p2 = np.array([hb*ib*2, -width/2.])
     lighthouse[iip:iip+Nsec,:] = circ_sec(p1, p2, 3*width, pos='left', Nang=Nsec)        
-    lighthousesecs = [bandS]
-    lighthousedic[bandS] = [lighthouse[iband:iip-1], '-', '#160016', 2.]
+    lighthousesecs.append(bandS)
+    lighthousedic[bandS] = [lighthouse[iband:iip-1], '-', '#6408AA', 2.]
 
     lighthouse = ma.masked_equal(lighthouse, gen.fillValueF)