Changeset 2607 in lmdz_wrf

Timestamp:

Jun 17, 2019, 12:02:20 AM (5 years ago)

Author:

lfita

Message:

Working ...

File:

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

trunk/tools/geometry_tools.py

@@ -1311 +1311 @@
             cuts[ic] = [icut, ecut, ipt, ept, Ncuts]
 
-    for iic in range(0):
+    for iic in range(1):
         cutvs = cuts[iic]
         icut = cutvs[0]
@@ -1362 +1362 @@
         cutv = cuts[icc]
         Ncuts = cutv[4]
+        print '  icc:', icc, 'ic ec ipt ept _______'
+        for ic in range(Ncuts):
+            print ic, ':', cutv[0][ic], cutv[1][ic], cutv[2][ic], cutv[3][ic]
+
         # Length of joining lines
         Nadds = []
@@ -1395 +1399 @@
             for ic in range(Ncuts-1):
                 cutpolygon.append(ipt[ic])
-
-                if ic == 0: 
+                if ic == 0:
                     for ip in range(icut[ic],N-1): cutpolygon.append(polygon[ip,:])
                 for ip in range(icut[ic],ecut[ic]): cutpolygon.append(polygon[ip,:])
                 # line
-                print 'Lluis ipt+1', ipt[ic+1], 'ept', ept[ic], 'Nadds:', Nadds[ic]
+                print 'Lluis ept', ept[ic], 'ipt+1', ipt[ic+1], 'Nadds:', Nadds[ic]
                 dx = (ipt[ic+1][1] - ept[ic][1])/(Nadds[ic]-1)
                 dy = (ipt[ic+1][0] - ept[ic][0])/(Nadds[ic]-1)
                 for ip in range(1,Nadds[ic]-1):
-                    cutpolygon.append([ept[ic][0]+dy*ip, ept[ic][0]+dy*ip])
+                    cutpolygon.append([ept[ic][0]+dy*ip, ept[ic][1]+dy*ip])
+            ic = Ncuts-1
+            print ic, 'final', iic,' :', icut[ic], ecut[ic]
             for ip in range(icut[ic],ecut[ic]): cutpolygon.append(polygon[ip,:])
         # right side
@@ -1417 +1422 @@
                 for ip in range(1,Nadds[ic]-1):
                     cutpolygon.append([ept[ic,0]+dy*ip, ept[ic,0]+dy*ip])
+            ic = Ncuts-1
             for ip in range(icut[ic],ecut[ic]): cutpolygon.append(polygon[ip,:])
             for ip in range(ecut[ic],N-1): cutpolygon.append(polygon[ip,:])
         sides[iic] = cutpolygon
+        for ip in range(len(cutpolygon)): iic, ip, ':', cutpolygon[ip]
         
     # joining sides by e1[Ncuts1-1] --> i2[0]; e2[Ncuts2-1] --> i1[0]
     cutv1 = cuts[0]
     Ncuts1 = cutv1[4]
-    ec1 = cutv1[2][Ncuts1-1]
-    ic1 = cutv1[1][0]
+    ec1 = cutv1[1][Ncuts1-1]
+    ic1 = cutv1[0][0]
     ept1 = cutv1[3][Ncuts1-1]
-    ipt1 = cutv1[4][0]
+    ipt1 = cutv1[2][0]
 
     cutv2 = cuts[0]
     Ncuts2 = cutv2[4]
-    ec2 = cutv2[2][Ncuts1-1]
-    ic2 = cutv2[1][0]
+    ec2 = cutv2[1][Ncuts1-1]
+    ic2 = cutv2[0][0]
     ept2 = cutv2[3][Ncuts1-1]
-    ipt2 = cutv2[4][0]
+    ipt2 = cutv2[2][0]
 
     finalcutpolygon = sides[0]