Changeset 2513 in lmdz_wrf for trunk

Timestamp:

May 7, 2019, 5:42:58 AM (7 years ago)

Author:

lfita

Message:

Fixing `boats' with the new 'circ_sec'

File:

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

trunk/tools/geometry_tools.py

@@ -884 +884 @@
 
     # forward section
-    fportside = circ_sec(bow,maxportside, length*2)
-    fstarboardside = circ_sec(maxstarboardside, bow, length*2)
+    fportside = circ_sec(maxportside, bow, length*2)
+    fstarboardside = circ_sec(bow, maxstarboardside, length*2)
     # aft section
-    aportside = circ_sec(maxportside, portside, length*2)
-    astarboardside = circ_sec(starboardside, maxstarboardside, length*2)
+    aportside = circ_sec(portside, maxportside, length*2)
+    astarboardside = circ_sec(maxstarboardside, starboardside, length*2)
     # stern
-    stern = circ_sec(portside, starboardside, length*2)
+    stern = circ_sec(starboardside, portside, length*2)
 
     dpts = stern.shape[0]
     boat = np.zeros((dpts*5,2), dtype=np.float)
 
-    boat[0:dpts,:] = fportside
-    boat[dpts:2*dpts,:] = aportside
-    boat[2*dpts:3*dpts,:] = stern
+    boat[0:dpts,:] = aportside
+    boat[dpts:2*dpts,:] = fportside
+    boat[2*dpts:3*dpts,:] = fstarboardside
     boat[3*dpts:4*dpts,:] = astarboardside
-    boat[4*dpts:5*dpts,:] = fstarboardside
+    boat[4*dpts:5*dpts,:] = stern
 
     fname = 'boat_L' + str(int(length*100.)) + '_B' + str(int(beam*100.)) + '_lb' +  \
@@ -915 +915 @@
         of.close()
         print fname + ": Successfull written '" + fname + "' !!"
- 
-    return boat
+
+
+    # Center line extending [fcl] percentage from length on aft and stern
+    fcl = 0.15
+    centerline = np.zeros((dpts,2), dtype=np.float)
+    dl = length*(1.+fcl*2.)/(dpts-1)
+    centerline[:,0] = np.arange(-length*fcl, length*(1. + fcl)+dl, dl)
+
+    # correct order of sections
+    boatsecs = ['aportside', 'fportside', 'fstarboardside', 'astarboardside',        \
+      'stern', 'centerline']
+
+    # dictionary with sections [polygon_vertices, line_type, line_color, line_width]
+    dicboat = {'fportside': [fportside, '-', '#8A5900', 2.],                         \
+      'aportside': [aportside, '-', '#8A5900', 2.],                                  \
+      'stern': [stern, '-', '#8A5900', 2.],                                          \
+      'astarboardside': [astarboardside, '-', '#8A5900', 2.],                        \
+      'fstarboardside': [fstarboardside, '-', '#8A5900', 2.],                        \
+      'centerline': [centerline, '-.', '#AA6464', 1.5]}
+    
+    fname = 'sailboat_L' + str(int(length*100.)) + '_B' + str(int(beam*100.)) +      \
+      '_lb' + str(int(lbeam*100.)) + '_sb' + str(int(sternbp*100.)) +'.dat'
+    if not os.path.isfile(fname):
+        print infmsg
+        print '  ' + fname + ": writting boat coordinates file '" + fname + "' !!"
+        of = open(fname, 'w')
+        of.write('# boat file with Length: ' + str(length) +' max_beam: '+str(beam)+ \
+          'length_at_max_beam:' + str(lbeam) + '% beam at stern: ' +str(sternbp)+'\n')
+        for ip in range(dpts*5):
+            of.write(str(boat[ip,0]) + ' ' + str(boat[ip,1]) + '\n')
+        
+        of.close()
+        print fname + ": Successfull written '" + fname + "' !!"
+  
+    return boat, boatsecs, dicboat
 
 def zsailing_boat(length=10., beam=1., lbeam=0.4, sternbp=0.5, lmast=0.6, wmast=0.1, \
@@ -941 +974 @@
     starboardside = np.array([0., beam*sternbp])
 
+    aportside = circ_sec(portside, maxportside, length*2)
+    fportside = circ_sec(maxportside, bow, length*2)
+    fstarboardside = circ_sec(bow, maxstarboardside, length*2)
+    astarboardside = circ_sec(maxstarboardside, starboardside, length*2)
+    stern = circ_sec(starboardside, portside, length*2)
+    dpts = fportside.shape[0]
+
+    # correct order of sections
+    sailingboatsecs = ['aportside', 'fportside', 'fstarboardside', 'astarboardside', \
+      'stern', 'mast', 'hsail', 'msail', 'centerline']
+
     # forward section
-    fportside = circ_sec(bow,maxportside, length*2)
-    fstarboardside = circ_sec(maxstarboardside, bow, length*2)
-    dpts = fportside.shape[0]
 
     # aft section
-    aportside = circ_sec(maxportside, portside, length*2)
-    astarboardside = circ_sec(starboardside, maxstarboardside, length*2)
     # stern
-    stern = circ_sec(portside, starboardside, length*2)
     # mast
     mast = p_circle(wmast,N=dpts)
@@ -960 +998 @@
         endsail = np.array([lsail*np.sin(sailsa), lsail*np.cos(sailsa)])
         endsail[0] = length - endsail[0]
-        if bow[1] < endsail[1]:
+        if bow[1] > endsail[1]:
             hsail = circ_sec(endsail, bow, lsail*2.15)
         else:
@@ -978 +1016 @@
         endsail = np.array([lsail*np.sin(sailsa), lsail*np.cos(sailsa)])
         endsail[0] = length*lmast - endsail[0]
-        if endsail[1] < begsail[1]:
+        if endsail[1] > begsail[1]:
             msail = circ_sec(begsail, endsail, lsail*2.15)
         else:
@@ -991 +1029 @@
     sailingboat = np.zeros((dpts*8+4,2), dtype=np.float)
 
-    sailingboat[0:dpts,:] = fportside
-    sailingboat[dpts:2*dpts,:] = aportside
-    sailingboat[2*dpts:3*dpts,:] = stern
+    sailingboat[0:dpts,:] = aportside
+    sailingboat[dpts:2*dpts,:] = fportside
+    sailingboat[2*dpts:3*dpts,:] = fstarboardside
     sailingboat[3*dpts:4*dpts,:] = astarboardside
-    sailingboat[4*dpts:5*dpts,:] = fstarboardside
+    sailingboat[4*dpts:5*dpts,:] = stern
     sailingboat[5*dpts,:] = [gen.fillValueF, gen.fillValueF]
     sailingboat[5*dpts+1:6*dpts+1,:] = mast
@@ -1012 +1050 @@
     centerline[:,0] = np.arange(-length*fcl, length*(1. + fcl)+dl, dl)
 
-    # correct order of sections
-    sailingboatsecs = ['fportside', 'aportside', 'stern', 'astarboardside',          \
-      'fstarboardside', 'mast', 'hsail', 'msail', 'centerline']
     # dictionary with sections [polygon_vertices, line_type, line_color, line_width]
     dicsailingboat = {'fportside': [fportside, '-', '#8A5900', 2.],                  \