Changeset 2341 in lmdz_wrf

Timestamp:

Feb 15, 2019, 6:06:26 PM (6 years ago)

Author:

lfita

Message:

Working version of 'range_faces' with homogenization of 'range'

Location:

trunk/tools

Files:

• diag_tools.py (modified) (2 diffs)
• module_ForDiagnostics.f90 (modified) (1 diff)
• module_scientific.f90 (modified) (2 diffs)

trunk/tools/diag_tools.py

@@ -1496 +1496 @@
           dsnewrange=dsnewrng, hvalrng=hvalleyrng, d1=dx, d2=dy)
 
-        print 'Finished!', rngt
         hgtmax = hgtmaxt.transpose()
         pthgtmax = pthgtmaxt.transpose()
@@ -1507 +1506 @@
         rangeshgtmax = rnghgtmaxt.transpose()
         ptrangeshgtmax = ptrnghgtmaxt.transpose()
-
-        # Homogenizing ranges
-        Lranges = np.where(ranges != 0, True, False)
-        print np.sum(Lranges)
-        Lrangest = Lranges.transpose()
-        rangest, Nrngs = fdin.module_scientific.polygons(dbg=False, boolmat=Lrangest, dx=dx, dy=dy)
-        ranges = ranges.transpose()
 
     else:

trunk/tools/module_ForDiagnostics.f90

@@ -1055 +1055 @@
 
     ! Homogenizing indices of the ranges
-    Lranges = iranges /= 0
-    CALL polygons(.FALSE., d1, d2, Lranges, ranges, Nranges)
-
-!    IF (TRIM(face) == 'WE') THEN
-!      CALL xzones_homogenization(d1, d2, iranges, ranges)
-!    ELSE IF (TRIM(face) == 'SN') THEN
-!      CALL yzones_homogenization(d1, d2, iranges, ranges)
-!    END IF
+    CALL continguos_homogene_zones(d1, d2, iranges, Nranges, ranges)
 
     RETURN

trunk/tools/module_scientific.f90

@@ -2597 +2597 @@
 
   ! The mathematical maximum woiuld be dx*dy/4, but let's be optimistic... (sorry Jero)
-  Nppt = dx*dy/10000
+  Nppt = dx*dy/100
 
   IF (ALLOCATED(borders)) DEALLOCATE(borders)
@@ -2703 +2703 @@
   CALL clean_polygons(dx, dy, boolmat, polys, Npoly, dbg)
 
-  PRINT *,'  Hello '
-
-  !IF (ALLOCATED(borders)) DEALLOCATE (borders)  
-  !IF (ALLOCATED(Nptpaths)) DEALLOCATE (Nptpaths)
-  !IF (ALLOCATED(paths)) DEALLOCATE (paths)
-  !IF (ALLOCATED(vertxs)) DEALLOCATE (vertxs)
-  !IF (ALLOCATED(points)) DEALLOCATE (points)
-  !IF (ALLOCATED(isin)) DEALLOCATE (isin)
-
-  PRINT *,'  Bye! '
+  IF (ALLOCATED(borders)) DEALLOCATE (borders)
+  IF (ALLOCATED(Nptpaths)) DEALLOCATE (Nptpaths)
+  IF (ALLOCATED(paths)) DEALLOCATE (paths)
+  IF (ALLOCATED(vertxs)) DEALLOCATE (vertxs)
+  IF (ALLOCATED(points)) DEALLOCATE (points)
+  IF (ALLOCATED(isin)) DEALLOCATE (isin)
 
   RETURN