Changeset 2610 in lmdz_wrf

Timestamp:

Jun 18, 2019, 1:20:28 AM (5 years ago)

Author:

lfita

Message:

Wokring cut_xpolygon !!

File:

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

trunk/tools/geometry_tools.py

@@ -848 +848 @@
     else:
         ##print '  ' + fname + ': found ', Ncuts, ' Ncuts'
-        if Ncuts > 1 and keep == 'left':
+        if Ncuts >= 1 and keep == 'left':
             # Re-shifting cuts by closest heigth.
             yis = []
@@ -885 +885 @@
                         icut.append(newecut[icc])
                         ipt.append(newept[icc])
-        ##print '    xval=', xval, 'cut, ip; ipt ep; ept ________'
-        ##for ic in range(Ncuts):
-        ##    print '      ', ic, icut[ic], ';', ipt[ic], ecut[ic], ';', ept[ic] 
+        print '    xval=', xval, 'cut, ip; ipt ep; ept ________'
+        for ic in range(Ncuts):
+            print '      ', ic, icut[ic], ';', ipt[ic], ecut[ic], ';', ept[ic] 
 
     # Length of joining lines
@@ -924 +924 @@
 
     cutpolygon = []
-
     iipc = 0
     for ic in range(Ncuts):
         dcpt = Ncpts[ic]
+        cutpolygon.append(ipt[ic])
         if keep == 'left':
             if ic == 0:
-                add_secpolygon_list(cutpolygon,0,icut[ic],polygon)
+                add_secpolygon_list(cutpolygon,icut[ic]+1,N,polygon)
+                add_secpolygon_list(cutpolygon,0,ecut[ic],polygon)
                 iipc = icut[ic]
             else:
                 add_secpolygon_list(cutpolygon,icut[ic]+1,ecut[ic],polygon)
-                #cutpolygon[iipc:iipc+dcpt-1,:] = polygon[icut[ic]+1:ecut[ic],:]
-                iipc = iipc + dcpt -1
         else:
-            cutpolygon.append(ipt[ic])
             add_secpolygon_list(cutpolygon,icut[ic]+1,ecut[ic],polygon)
-            #cutpolygon[iipc:iipc+dcpt-1,:]=polygon[icut[ic]+1:ecut[ic],:]
             iipc = iipc+dcpt-1
-
         # cutting line
         cutline = np.zeros((Nadds[ic],2), dtype=np.float)
@@ -950 +946 @@
             cutline[ip,:] = ipt[ic] + np.array([dy*ip,dx*ip])
         cutline[Nadds[ic]-1,:] = ept[ic]
-        print 'Lluis ipt0', ipt[ic], 'cutline[Nadds-ic,:]', cutline[Nadds[ic]-1,:], 'ept', ept[ic]
         if keep == 'left':
-            if ic == 0: 
-                for ip in range(Nadds[ic]): cutpolygon.append(cutline[ip,:])
-            else: 
-                for ip in range(Nadds[ic]-1,0,-1): cutpolygon.append(cutline[ip,:])
+            for ip in range(Nadds[ic]-1,-1,-1): cutpolygon.append(cutline[ip,:])
             iipc = iipc+Nadds[ic]
             if ic == 0:
-#                cutpolygon[iipc:iipc+N-ecut[ic]-1,:] = polygon[ecut[ic]+1:N,:]
-#                iipc = iipc + N-ecut[ic]-1
-                add_secpolygon_list(cutpolygon,ecut[ic]-2,N,polygon)
-                #cutpolygon[iipc:iipc+N-ecut[ic]+2,:] = polygon[ecut[ic]-2:N,:]
-                iipc = iipc + N-ecut[ic]+2
+                add_secpolygon_list(cutpolygon,ecut[ic],N,polygon)
                 cutpolygon.append(polygon[0,:])
                 iipc = iipc + 1
         else:
-            for ip in range(Nadds[ic]-1,0,-1): cutpolygon.append(cutline[ip,:])
+            for ip in range(Nadds[ic]-1,-1,-1): cutpolygon.append(cutline[ip,:])
             iipc = iipc+Nadds[ic]
         cutpolygon.append([gen.fillValueF, gen.fillValueF])
@@ -986 +974 @@
             else:
                 rmpolygon.append(cutpolygon[ip,:])
-    Npts = len(rmpolygon)
 
     rmpolygon = np.array(rmpolygon)
     cutpolygon = rm_consecpt_polygon(rmpolygon)
+    Npts = cutpolygon.shape[0]
 
     cutpolygon = ma.masked_equal(cutpolygon, gen.fillValueF)