Changeset 2491 in lmdz_wrf

Timestamp:

May 1, 2019, 4:50:03 PM (6 years ago)

Author:

lfita

Message:

Adding as return values on `zsailing_boat':

• Adding `centerline'
• list with name of sections of the object
• dictionary with the name of sections and: vertices of polygons, line type, line color and line width

File:

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

trunk/tools/geometry_tools.py

@@ -641 +641 @@
 
     # forward section
-    fportsaid = circ_sec(bow,maxportside, length*2)
-    fstarboardsaid = circ_sec(maxstarboardside, bow, length*2)
+    fportside = circ_sec(bow,maxportside, length*2)
+    fstarboardside = circ_sec(maxstarboardside, bow, length*2)
     # aft section
-    aportsaid = circ_sec(maxportside, portside, length*2)
-    astarboardsaid = circ_sec(starboardside, maxstarboardside, length*2)
+    aportside = circ_sec(maxportside, portside, length*2)
+    astarboardside = circ_sec(starboardside, maxstarboardside, length*2)
     # stern
     stern = circ_sec(portside, starboardside, length*2)
@@ -652 +652 @@
     boat = np.zeros((dpts*5,2), dtype=np.float)
 
-    boat[0:dpts,:] = fportsaid
-    boat[dpts:2*dpts,:] = aportsaid
+    boat[0:dpts,:] = fportside
+    boat[dpts:2*dpts,:] = aportside
     boat[2*dpts:3*dpts,:] = stern
-    boat[3*dpts:4*dpts,:] = astarboardsaid
-    boat[4*dpts:5*dpts,:] = fstarboardsaid
+    boat[3*dpts:4*dpts,:] = astarboardside
+    boat[4*dpts:5*dpts,:] = fstarboardside
 
     fname = 'boat_L' + str(int(length*100.)) + '_B' + str(int(beam*100.)) + '_lb' +  \
@@ -699 +699 @@
 
     # forward section
-    fportsaid = circ_sec(bow,maxportside, length*2)
-    fstarboardsaid = circ_sec(maxstarboardside, bow, length*2)
-    dpts = fportsaid.shape[0]
+    fportside = circ_sec(bow,maxportside, length*2)
+    fstarboardside = circ_sec(maxstarboardside, bow, length*2)
+    dpts = fportside.shape[0]
 
     # aft section
-    aportsaid = circ_sec(maxportside, portside, length*2)
-    astarboardsaid = circ_sec(starboardside, maxstarboardside, length*2)
+    aportside = circ_sec(maxportside, portside, length*2)
+    astarboardside = circ_sec(starboardside, maxstarboardside, length*2)
     # stern
     stern = circ_sec(portside, starboardside, length*2)
@@ -734 +734 @@
     sailingboat = np.zeros((dpts*8+4,2), dtype=np.float)
 
-    sailingboat[0:dpts,:] = fportsaid
-    sailingboat[dpts:2*dpts,:] = aportsaid
+    sailingboat[0:dpts,:] = fportside
+    sailingboat[dpts:2*dpts,:] = aportside
     sailingboat[2*dpts:3*dpts,:] = stern
-    sailingboat[3*dpts:4*dpts,:] = astarboardsaid
-    sailingboat[4*dpts:5*dpts,:] = fstarboardsaid
+    sailingboat[3*dpts:4*dpts,:] = astarboardside
+    sailingboat[4*dpts:5*dpts,:] = fstarboardside
     sailingboat[5*dpts,:] = [gen.fillValueF, gen.fillValueF]
     sailingboat[5*dpts+1:6*dpts+1,:] = mast
@@ -749 +749 @@
     sailingboat = ma.masked_equal(sailingboat, gen.fillValueF)
 
+    # 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
+    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.],                  \
+      'aportside': [aportside, '-', '#8A5900', 2.],                                  \
+      'stern': [stern, '-', '#8A5900', 2.],                                          \
+      'astarboardside': [astarboardside, '-', '#8A5900', 2.],                        \
+      'fstarboardside': [fstarboardside, '-', '#8A5900', 2.],                        \
+      'mast': [mast, '-', '#8A5900', 2.], 'hsail': [hsail, '-', '#AAAAAA', 1.],      \
+      'msail': [msail, '-', '#AAAAAA', 1.],                                          \
+      '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.)) +                \
@@ -770 +789 @@
         print fname + ": Successfull written '" + fname + "' !!"
  
-    return sailingboat
+    return sailingboat, sailingboatsecs, dicsailingboat
 
 def write_join_poly(polys, flname='join_polygons.dat'):