Changeset 2486 in lmdz_wrf

Timestamp:

Apr 30, 2019, 3:08:19 AM (6 years ago)

Author:

lfita

Message:

Adding individual angles for head and main sails

File:

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

trunk/tools/geometry_tools.py

@@ -676 +676 @@
 
 def zsailing_boat(length=10., beam=1., lbeam=0.4, sternbp=0.5, lmast=0.6, wmast=0.1, \
-  sd=0., lheads=0.38, lmains=0.55):
+  hsd=5., msd=5., lheads=0.38, lmains=0.55):
     """ Function to define an schematic sailing boat from the z-plane with sails
       length: length of the boat (without stern, default 10)
@@ -684 +684 @@
       lmast: position of the mast (as percentage of length, default 0.6)
       wmast: width of the mast (default 0.1)
-      sd: sails direction respect to center line (default 0.)
+      hsd: head sail direction respect to center line (default 5.)
+      msd: main sail direction respect to center line (default 5.)
       lheads: length of head sail (as percentage of legnth, defaul 0.38)
       lmains: length of main sail (as percentage of legnth, defaul 0.55)
@@ -712 +713 @@
     # head sails
     lsail = lheads*length
-    sailsa = np.pi/2. - np.pi*5./180. - np.pi*sd/180.
+    sailsa = np.pi/2. - np.pi*hsd/180.
     endsail = np.array([lsail*np.sin(sailsa), lsail*np.cos(sailsa)])
     endsail[0] = length - endsail[0]
-    hsail = circ_sec(endsail, bow, lsail*2.15)
+    if bow[1] < endsail[1]:
+        hsail = circ_sec(endsail, bow, lsail*2.15)
+    else:
+        hsail = circ_sec(bow, endsail, lsail*2.15)
 
     # main sails
+    sailsa = np.pi/2. - np.pi*msd/180.
     lsail = lmains*length
+    begsail = np.array([length*lmast, 0.])
     endsail = np.array([lsail*np.sin(sailsa), lsail*np.cos(sailsa)])
     endsail[0] = length*lmast - endsail[0]
-    msail = circ_sec(endsail, np.array([length*lmast, 0.]), lsail*2.15)
+    if endsail[1] < begsail[1]:
+        msail = circ_sec(begsail, endsail, lsail*2.15)
+    else:
+        msail = circ_sec(endsail, begsail, lsail*2.15)
 
     sailingboat = np.zeros((dpts*8+4,2), dtype=np.float)
@@ -743 +752 @@
       '_lb' + str(int(lbeam*100.)) + '_sb' + str(int(sternbp*100.)) +                \
       '_lm' + str(int(lmast*100.)) + '_wm' + str(int(wmast)) +                       \
-      '_sd' + str(int(sd)) + '_hs' + str(int(lheads*100.)) +                         \
-      '_ms' + str(int(lheads*100.)) + '.dat'
+      '_hsd' + str(int(hsd)) + '_hs' + str(int(lheads*100.)) +                       \
+      '_ms' + str(int(lheads*100.)) + '_msd' + str(int(msd)) +'.dat'
     if not os.path.isfile(fname):
         print infmsg
@@ -752 +761 @@
           'length_at_max_beam:' + str(lbeam) + '% beam at stern: ' + str(sternbp)+   \
           ' % mast position: '+ str(lmast) + ' % mast width: ' + str(wmast) + ' ' +  \
-          ' sails direction:' + str(sd) + ' head sail length: ' + str(lheads) + ' %'+\
-          ' main sail length' + str(lmains) + '\n')
+          ' head sail direction:' + str(hsd) + ' head sail length: ' + str(lheads) + \
+          ' %' + ' main sail length' + str(lmains) + ' main sail direction:' +       \
+          str(msd) +'\n')
         for ip in range(dpts*5):
             of.write(str(sailingboat[ip,0]) + ' ' + str(sailingboat[ip,1]) + '\n')