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

Timestamp:

Apr 30, 2019, 1:55:28 AM (6 years ago)

Author:

lfita

Message:

Working sails in `zsailboat'

File:

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

trunk/tools/geometry_tools.py

@@ -712 +712 @@
     # head sails
     lsail = lheads*length
-    sailsa = np.pi/2. + sd*(1.+0.05)*180./np.pi
+    sailsa = np.pi/2. - np.pi*5./180. - np.pi*sd/180.
     endsail = np.array([lsail*np.sin(sailsa), lsail*np.cos(sailsa)])
     endsail[0] = length - endsail[0]
-    hsail = circ_sec(bow, endsail, lsail*1.15)
+    hsail = circ_sec(endsail, bow, lsail*2.15)
+
     # main sails
     lsail = lmains*length
     endsail = np.array([lsail*np.sin(sailsa), lsail*np.cos(sailsa)])
     endsail[0] = length*lmast - endsail[0]
-    msail = circ_sec(np.array([length*lmast,0.]), endsail, lsail*1.15)
-
-    sailingboat = np.zeros((dpts*8+3,2), dtype=np.float)
+    msail = circ_sec(endsail, np.array([length*lmast, 0.]), lsail*2.15)
+
+    sailingboat = np.zeros((dpts*8+4,2), dtype=np.float)
 
     sailingboat[0:dpts,:] = fportsaid
@@ -734 +735 @@
     sailingboat[6*dpts+2:7*dpts+2,:] = hsail
     sailingboat[7*dpts+2,:] = [gen.fillValueF, gen.fillValueF]
-    sailingboat[7*dpts+2:8*dpts+2,:] = msail
+    sailingboat[7*dpts+3:8*dpts+3,:] = msail
+    sailingboat[8*dpts+3,:] = [gen.fillValueF, gen.fillValueF]
 
     sailingboat = ma.masked_equal(sailingboat, gen.fillValueF)