Changeset 2546 in lmdz_wrf for trunk

Timestamp:

May 19, 2019, 3:33:49 PM (6 years ago)

Author:

lfita

Message:

Adding in `cut_ypolygon', 'keep' value

File:

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

trunk/tools/geometry_tools.py

@@ -428 +428 @@
       yval: value to use to cut the polygon
       keep: part to keep from the height ('bottom', default)
+         'bottom': below the height
+         'above': above the height
       Nadd: additional points to add to draw the line (20, default)
     """
@@ -433 +435 @@
 
     N = polygon.shape[0]
+    availkeeps = ['bottom', 'above']
+
+    if not gen.searchInlist(availkeeps, keep):
+        print errormsg
+        print '  ' + fname + ": wring keep '" + keep + "' value !!"
+        print '    available ones:', availkeeps
+        quit(-1)
 
     ipt = None
@@ -469 +478 @@
                 dd = yval - polygon[ip,0]
                 ipt = [yval, polygon[ip,1]+dx*dd/dy]
-                print ip, 'Lluis pi:', polygon[ip,:], 'pi+1', polygon[eep,:]
-                print '    yval', yval, 'dx', dx, 'dy', dy
-                print '      ipt', ipt
 
             if polygon[ip,0] >= yval and polygon[eep,0] <= yval:
@@ -479 +485 @@
                 dd = yval - polygon[ip,0]
                 ept = [yval, polygon[ip,1]+dx*dd/dy]
-                print ip, 'Lluis pi:', polygon[ip,:], 'pi+1', polygon[eep,:]
-                print '    yval', yval, 'dx', dx, 'dy', dy
-                print '      ept', ept
 
     if ipt is None or ept is None:
@@ -488 +491 @@
         irmv = 0
         rmpolygon = []
-        for ip in range(N):
-            if polygon[ip,0] > yval:
-                rmpolygon.append([gen.fillValueF, gen.fillValueF])
-            else:
-                rmpolygon.append(polygon[ip,:])
+        if keep == 'bottom':
+            for ip in range(N):
+                if polygon[ip,0] > yval:
+                    rmpolygon.append([gen.fillValueF, gen.fillValueF])
+                else:
+                    rmpolygon.append(polygon[ip,:])
+        else:
+            for ip in range(N):
+                if polygon[ip,0] < yval:
+                    rmpolygon.append([gen.fillValueF, gen.fillValueF])
+                else:
+                    rmpolygon.append(polygon[ip,:])
+
         Npts = len(rmpolygon)
         cutpolygon = np.array(rmpolygon)
     else:
-        Npts = icut + (N-ecut) + Nadd
-
-        cutpolygon = np.zeros((Npts,2), dtype=np.float)
-        if type(polygon) == type(gen.mamat):
-            cutpolygon[0:icut+1,:] = polygon[0:icut+1,:].filled(gen.fillValueF)
+        if keep == 'bottom':
+            Npts = icut + (N-ecut) + Nadd
+
+            cutpolygon = np.zeros((Npts,2), dtype=np.float)
+            if type(polygon) == type(gen.mamat):
+                cutpolygon[0:icut+1,:] = polygon[0:icut+1,:].filled(gen.fillValueF)
+            else:
+                cutpolygon[0:icut+1,:] = polygon[0:icut+1,:]
+            iip = icut+1
         else:
-            cutpolygon[0:icut+1,:] = polygon[0:icut+1,:]
+            Npts = ecut - icut + Nadd-1
+
+            cutpolygon = np.zeros((Npts,2), dtype=np.float)
+            if type(polygon) == type(gen.mamat):
+                cutpolygon[0:ecut-icut-1,:] = polygon[icut+1:ecut,:].filled(gen.fillValueF)
+            else:
+                cutpolygon[0:ecut-icut-1,:] = polygon[icut+1:ecut,:]
+            iip = ecut-icut-1
 
         # cutting line
@@ -512 +534 @@
             cutline[ip,:] = ipt + np.array([dy*ip,dx*ip])
         cutline[Nadd-1,:] = ept
-        cutpolygon[icut+1:icut+1+Nadd,:] = cutline
-        cutpolygon[icut+1+Nadd:Npts,:] = polygon[ecut+1:N,:]
+        cutpolygon[iip:iip+Nadd,:] = cutline
+        if keep == 'bottom':
+            cutpolygon[iip+Nadd:Npts,:] = polygon[ecut+1:N,:]
 
     cutpolygon = ma.masked_equal(cutpolygon, gen.fillValueF)