Changeset 2514 in lmdz_wrf

Timestamp:

May 7, 2019, 5:55:44 AM (7 years ago)

Author:

lfita

Message:

Fixing `p_doubleArrow', right calculation of end of arms

File:

• trunk/tools/geometry_tools.py (modified) (1 diff)

trunk/tools/geometry_tools.py

@@ -833 +833 @@
 
     doublearrowdic = {}
-
+    ddy = width*np.tan(angle*np.pi/180.)/2.
     # Arms
-    dx = length/(N4-1)
-    for ix in range(N4-1):
+    dx = (length-ddy)/(N4-1)
+    for ix in range(N4):
         doubleArrow[ix,:] = [dx*ix,-width/2.]
-    doublearrowdic['leftarm'] = [doubleArrow[0:N4-1,:], '-', '#000000', 2.]
-    doubleArrow[N4-1,:] = [gen.fillValueF,gen.fillValueF]
-    for ix in range(N4-1):
-        doubleArrow[N4+ix,:] = [dx*ix,width/2.]
-    doublearrowdic['rightarm'] = [doubleArrow[N4:2*N4-1,:], '-', '#000000', 2.]
-    doubleArrow[2*N4-1,:] = [gen.fillValueF,gen.fillValueF]
+    doublearrowdic['leftarm'] = [doubleArrow[0:N4,:], '-', '#000000', 2.]
+    doubleArrow[N4,:] = [gen.fillValueF,gen.fillValueF]
+    for ix in range(N4):
+        doubleArrow[N4+1+ix,:] = [dx*ix,width/2.]
+    doublearrowdic['rightarm'] = [doubleArrow[N4+1:2*N4+1,:], '-', '#000000', 2.]
+    doubleArrow[2*N4+1,:] = [gen.fillValueF,gen.fillValueF]
 
     # Head
     N42 = int((N-2 - 2*N4)/2)
-    dx = width*(1.+alength)/(N42-1)
+    dx = width*(1.+alength)*np.cos(angle*np.pi/180.)/(N42-1)
+    dy = width*(1.+alength)*np.sin(angle*np.pi/180.)/(N42-1)
     for ix in range(N42):
-        doubleArrow[2*N4+ix,:] = [length-dx*ix,-dx*ix]
+        doubleArrow[2*N4+2+ix,:] = [length-dy*ix,-dx*ix]
     doublearrowdic['lefthead'] = [doubleArrow[2*N4:2*N4+N42,:], '-', '#000000', 2.]
-    doubleArrow[2*N4+N42,:] = [gen.fillValueF,gen.fillValueF]
-
-    N43 = N-2 - 2*N4 - N42 + 1
-    dx = width*(1.+alength)/(N43-1)
+    doubleArrow[2*N4+2+N42,:] = [gen.fillValueF,gen.fillValueF]
+
+    N43 = N-3 - 2*N4 - N42 + 1
+    dx = width*(1.+alength)*np.cos(angle*np.pi/180.)/(N43-1)
+    dy = width*(1.+alength)*np.sin(angle*np.pi/180.)/(N43-1)
     for ix in range(N43):
-        doubleArrow[2*N4+N42+1+ix,:] = [length-dx*ix,dx*ix]
-    doublearrowdic['rightthead'] = [doubleArrow[2*N4+N42:51,:], '-', '#000000', 2.]
+        doubleArrow[2*N4+N42+2+ix,:] = [length-dy*ix,dx*ix]
+    doublearrowdic['rightthead'] = [doubleArrow[2*N4+N42+2:51,:], '-', '#000000', 2.]
 
     doubleArrow = ma.masked_equal(doubleArrow, gen.fillValueF)