Changeset 2586 in lmdz_wrf

Timestamp:

Jun 3, 2019, 12:20:31 AM (6 years ago)

Author:

lfita

Message:

Changing name from val_between' to val_consec_between'

File:

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

trunk/tools/geometry_tools.py

@@ -43 +43 @@
 # spheric_line: Function to transform a series of locations in lon, lat coordinates 
 #   to x,y,z over an 3D spaceFunction to provide coordinates of a line  on a 3D space
-# val_between: Function to provide if a given value is between two consecutive ones
+# val_consec_between: Function to provide if a given value is between two consecutive ones
 # write_join_poly: Function to write an ASCII file with the combination of polygons
 
@@ -436 +436 @@
     return polys
 
-def val_between(valA, valB, val):
+def val_consec_between(valA, valB, val):
     """ Function to provide if a given value is between two consecutive ones
       valA: first value
       valB: second value
       val: value to determine if it is between
-      >>> val_between(0.5,1.5,0.8)
+      >>> val_consec_between(0.5,1.5,0.8)
       True
-      >>> val_between(0.5,1.5.,-0.8)
+      >>> val_consec_between(0.5,1.5.,-0.8)
       False
-      >>> val_between(0.5,1.5,0.5)
+      >>> val_consec_between(0.5,1.5,0.5)
       True
-    """
-    fname = 'val_between'
+      >>> val_consec_between(-1.58, -1.4, -1.5)
+      True
+      >>> val_consec_between(-1.48747753212, -1.57383530044, -1.5)
+      False
+    """
+    fname = 'val_consec_between'
 
     btw = False
+    diffA = valA - val
+    diffB = valB - val
+    absdA = np.abs(diffA)
+    absdB = np.abs(diffB)
+    #if (diffA/absdA)* (diffB/absdB) < 0.: btw = True
+#    if valA < 0. and valB < 0. and val < 0.:
+#        if (valA >= val and valB < val) or (valA > val and valB <= val): btw =True
+#    else:
+#        if (valA <= val and valB > val) or (valA < val and valB >= val): btw =True
     if (valA <= val and valB > val) or (valA < val and valB >= val): btw =True
-    if (valA >= val and valB < val) or (valA > val and valB <= val): btw =True
 
     return btw
@@ -494 +506 @@
                 if eep == N: eep = 0
       
-                if val_between(polygon[ip,0], polygon[eep,0], yval):
+                if val_consec_between(polygon[ip,0], polygon[eep,0], yval):
                     icut.append(ip)
                     dx = polygon[eep,1] - polygon[ip,1]
@@ -501 +513 @@
                     ipt.append([yval, polygon[ip,1]+dx*dd/dy])
 
-                if val_between(polygon[ip,0], polygon[eep,0], yval):
+                if val_consec_between(polygon[ip,0], polygon[eep,0], yval):
                     ecut.append(ip)
                     dx = polygon[eep,1] - polygon[ip,1]
@@ -514 +526 @@
             if eep == N: eep = 0
       
-            if val_between(polygon[ip,0], polygon[eep,0], yval):
+            if val_consec_between(polygon[ip,0], polygon[eep,0], yval):
                 icut.append(ip)
                 dx = polygon[eep,1] - polygon[ip,1]
@@ -521 +533 @@
                 ipt.append([yval, polygon[ip,1]+dx*dd/dy])
 
-            if val_between(polygon[ip,0], polygon[eep,0], yval):
+            if val_consec_between(polygon[ip,0], polygon[eep,0], yval):
                 ecut.append(ip)
                 dx = polygon[eep,1] - polygon[ip,1]
@@ -636 +648 @@
                 if eep == N: eep = 0
       
-                if val_between(polygon[ip,1], polygon[eep,1], xval):
+                if val_consec_between(polygon[ip,1], polygon[eep,1], xval):
                     icut.append(ip)
                     dx = polygon[eep,1] - polygon[ip,1]
@@ -643 +655 @@
                     ipt.append([polygon[ip,0]+dy*dd/dx, xval])
 
-                if val_between(polygon[ip,1], polygon[eep,1], xval):
+                if val_consec_between(polygon[eep,1], polygon[ip,1], xval):
                     ecut.append(ip)
                     dx = polygon[eep,1] - polygon[ip,1]
@@ -656 +668 @@
             if eep == N: eep = 0
       
-            print ip, polygon[ip,1], polygon[eep,1], xval, ':', val_between(polygon[ip,1], polygon[eep,1], xval)
-            if val_between(polygon[ip,1], polygon[eep,1], xval):
+            print ip, polygon[ip,1], polygon[eep,1], xval, ':', val_consec_between(polygon[ip,1], polygon[eep,1], xval)
+            if val_consec_between(polygon[ip,1], polygon[eep,1], xval):
                 icut.append(ip)
                 dx = polygon[eep,1] - polygon[ip,1]
@@ -664 +676 @@
                 ipt.append([polygon[ip,0]+dy*dd/dx, xval])
 
-            if val_between(polygon[ip,1], polygon[eep,1], xval):
+            if val_consec_between(polygon[eep,1], polygon[ip,1], xval):
                 ecut.append(ip)
                 dx = polygon[eep,1] - polygon[ip,1]
@@ -677 +689 @@
     else:
         print '  ' + fname + ': found ', Ncuts, ' Ncuts'
-        print '    yval=', xval, 'cut, ip; ipt ep; ept ________'
+        print '    xval=', xval, 'cut, ip; ipt ep; ept ________'
         for ic in range(Ncuts):
             print '      ', ic, icut[ic], ';', ipt[ic], ecut[ic], ';', ept[ic] 
@@ -703 +715 @@
         ip = ipt[ic]
         if ic == 0: 
-            dpts = icut[ic] + ecut[ic] + Nadds[ic]
+            dpts = ecut[ic] - icut[ic] + Nadds[ic] + icut[ic]
         else:
             dpts = ecut[ic] - icut[ic] + Nadds[ic] - 1
@@ -712 +724 @@
         Ntotpts = Ntotpts + dpts
 
-    cutpolygon = np.ones((Ntotpts,2), dtype=np.float)*gen.fillValue
+    cutpolygon = np.ones((Ntotpts+Ncuts-1,2), dtype=np.float)*gen.fillValue
 
     iip = 0
@@ -720 +732 @@
         if keep == 'left':
             if ic == 0:
-                cutpolygon[0:icut[ic]] = polygon[0:icut[ic],:]
+                cutpolygon[0:icut[ic],:] = polygon[0:icut[ic],:]
                 iip = icut[ic]
                 iipc = icut[ic]
-            dcpt = Ncpts[ic]-Nadds[ic]
-            cutpolygon[iipc+1:iipc+dcpt,:] = polygon[icut[ic]-1:ecut[ic]+1,:]
+                dcpt = ecut[ic]-icut[ic]
+                print ic, ':', 0, icut[ic], 'iipc:', iipc, 'dcpt', dcpt
+            else:
+                dcpt = Ncpts[ic]-Nadds[ic]
+            print ic, 'dcpt:', dcpt, '<Ncpts>', Ncpts[ic], '<--', icut[ic]-1,ecut[ic]+1, '=',  iipc+1, iipc+dcpt+1
+            cutpolygon[iipc+1:iipc+dcpt+1,:] = polygon[icut[ic]-1:ecut[ic]+1,:]
             iipc = iipc + dcpt
         else: