Changeset 2493 in lmdz_wrf

Timestamp:

May 1, 2019, 11:19:01 PM (6 years ago)

Author:

lfita

Message:

Adding up winds' condition for sails to zsailing_boat'

File:

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

trunk/tools/geometry_tools.py

@@ -638 +638 @@
     dx = length/(N-1)
     ia = ival*np.pi/180.
-    da = 2*np.pi*dx/3.
+    da = 2*np.pi*dx/lamb
 
     sinusoide = np.zeros((N,2), dtype=np.float)
@@ -719 +719 @@
       lmast: position of the mast (as percentage of length, default 0.6)
       wmast: width of the mast (default 0.1)
-      hsd: head sail direction respect to center line (default 5.)
-      msd: main sail direction respect to center line (default 5.)
+      hsd: head sail direction respect to center line (default 5., -999.99 for upwind)
+      msd: main sail direction respect to center line (default 5., -999.99 for upwind)
       lheads: length of head sail (as percentage of legnth, defaul 0.38)
       lmains: length of main sail (as percentage of legnth, defaul 0.55)
@@ -748 +748 @@
     # head sails
     lsail = lheads*length
-    sailsa = np.pi/2. - np.pi*hsd/180.
-    endsail = np.array([lsail*np.sin(sailsa), lsail*np.cos(sailsa)])
-    endsail[0] = length - endsail[0]
-    if bow[1] < endsail[1]:
-        hsail = circ_sec(endsail, bow, lsail*2.15)
+    if hsd != -999.99:
+        sailsa = np.pi/2. - np.pi*hsd/180.
+        endsail = np.array([lsail*np.sin(sailsa), lsail*np.cos(sailsa)])
+        endsail[0] = length - endsail[0]
+        if bow[1] < endsail[1]:
+            hsail = circ_sec(endsail, bow, lsail*2.15)
+        else:
+            hsail = circ_sec(bow, endsail, lsail*2.15)
     else:
-        hsail = circ_sec(bow, endsail, lsail*2.15)
+        hsail0 = p_sinusiode(length=lsail, amp=0.2, lamb=0.75, N=dpts)
+        hsail = np.zeros((dpts,2), dtype=np.float)
+        hsail[:,0] = hsail0[:,1]
+        hsail[:,1] = hsail0[:,0]
+        hsail = bow - hsail
 
     # 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]
-    if endsail[1] < begsail[1]:
-        msail = circ_sec(begsail, endsail, lsail*2.15)
+    if msd != -999.99:
+        sailsa = np.pi/2. - np.pi*msd/180.
+        begsail = np.array([length*lmast, 0.])
+        endsail = np.array([lsail*np.sin(sailsa), lsail*np.cos(sailsa)])
+        endsail[0] = length*lmast - endsail[0]
+        if endsail[1] < begsail[1]:
+            msail = circ_sec(begsail, endsail, lsail*2.15)
+        else:
+            msail = circ_sec(endsail, begsail, lsail*2.15)
     else:
-        msail = circ_sec(endsail, begsail, lsail*2.15)
+        msail0 = p_sinusiode(length=lsail, amp=0.25, lamb=1., N=dpts)
+        msail = np.zeros((dpts,2), dtype=np.float)
+        msail[:,0] = msail0[:,1]
+        msail[:,1] = msail0[:,0]
+        msail = [length*lmast,0] - msail
 
     sailingboat = np.zeros((dpts*8+4,2), dtype=np.float)