Changeset 2437 in lmdz_wrf

Timestamp:

Apr 14, 2019, 10:40:55 PM (6 years ago)

Author:

lfita

Message:

Adding:

• maximum absolute value (x/y) for `max_coords_poly'

Changing:

• Shape of the sailing boat

File:

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

trunk/tools/geometry_tools.py

@@ -228 +228 @@
     >>> square[3,:] = [-0.5,0.5]
     >>> max_coords_poly(square)
-    [-0.5, 0.5], [-0.5, 0.5], [0.5, 0.5]
+    [-0.5, 0.5], [-0.5, 0.5], [0.5, 0.5], 0.5
     """
     fname = 'max_coords_poly'
 
+    # x-coordinate min/max
     nx = np.min(polygon[:,1])
     xx = np.max(polygon[:,1])
+
+    # y-coordinate min/max
     ny = np.min(polygon[:,0])
     xy = np.max(polygon[:,0])
 
+    # x/y-coordinate maximum of absolute values
     axx = np.max(np.abs(polygon[:,1]))
     ayx = np.max(np.abs(polygon[:,0]))
 
-    return [nx, xx], [ny, xy], [ayx, axx]
+    # absolute maximum
+    xyx = np.max([axx, ayx])
+
+    return [nx, xx], [ny, xy], [ayx, axx], xyx
 
 ####### ###### ##### #### ### ## #
@@ -376 +383 @@
 
 # FROM: http://www.photographers1.com/Sailing/NauticalTerms&Nomenclature.html
-def zsailing_boat(length=10., beam=1., lbeam=0.5, sternbp=0.5):
+def zsailing_boat(length=10., beam=1., lbeam=0.4, sternbp=0.5):
     """ Function to define an schematic boat from the z-plane
       length: length of the boat (without stern, default 10)
       beam: beam of the boat (default 1)
-      lbeam: length at beam (as percentage of length, default 0.5)
+      lbeam: length at beam (as percentage of length, default 0.4)
       sternbp: beam at stern (as percentage of beam, default 0.5)
     """