Changeset 2223 in lmdz_wrf

Timestamp:

Nov 9, 2018, 2:21:21 PM (6 years ago)

Author:

lfita

Message:

Adding to 'range_faces':

• -2:|downhill;-1:|downhill-valley;|0:|peak|;1:|uphill-valley;2:|uphill
• filtering outside any range

Location:

trunk/tools

Files:

• diag_tools.py (modified) (3 diffs)
• diagnostics.py (modified) (2 diffs)
• module_ForDiagnostics.f90 (modified) (5 diffs)
• module_ForDiagnosticsVars.f90 (modified) (3 diffs)
• variables_values.dat (modified) (1 diff)

trunk/tools/diag_tools.py

@@ -1400 +1400 @@
         dy = hgt.shape[0]
 
-        hgtmaxt, pthgtmaxt, dhgtt, peakst, valleyst, ofacest, ffacest, rnghgtmaxt,   \
-          ptrnghgtmaxt =                                                             \
+        hgtmaxt, pthgtmaxt, dhgtt, peakst, valleyst, ofacest, ffacest, rngt,         \
+          rnghgtmaxt, ptrnghgtmaxt =                                                 \
           fdin.module_fordiagnostics.compute_range_faces(lon=lon[:].transpose(),     \
           lat=lat[:].transpose(), hgt=hgt[:].transpose(), dist=ds[:].transpose(),    \
@@ -1414 +1414 @@
         origfaces = ofacest.transpose()
         filtfaces = ffacest.transpose()
+        ranges = rngt.transpose()
         rangeshgtmax = rnghgtmaxt.transpose()
         ptrangeshgtmax = ptrnghgtmaxt.transpose()
@@ -1423 +1424 @@
 
     return hgtmax, pthgtmax, dhgt, peaks, valleys, origfaces, filtfaces, vardims,    \
-      varvdims, rangeshgtmax, ptrangeshgtmax
+      varvdims, ranges, rangeshgtmax, ptrangeshgtmax
 
 ####### ###### ##### #### ### ## # END Fortran diagnostics

trunk/tools/diagnostics.py

@@ -781 +781 @@
 
         orogmax, ptorogmax, dhgt, peaks, valleys, origfaces, diagout, diagoutd,      \
-          diagoutvd, rngorogmax, ptrngorogmax = diag.Forcompute_range_faces(lon, lat,\
-          hgt, WRFds, face, dsfilt, dsnewrange, hvalleyrange, dnamesvar, dvnamesvar)
+          diagoutvd, rng, rngorogmax, ptrngorogmax= diag.Forcompute_range_faces(lon, \
+           lat, hgt, WRFds, face, dsfilt, dsnewrange, hvalleyrange, dnamesvar,       \
+           dvnamesvar)
 
         # Removing the nonChecking variable-dimensions from the initial list
@@ -798 +799 @@
         if face == 'WE': axis = 'lon'
         elif face == 'SN': axis = 'lat'
+
+        ncvar.insert_variable(ncobj, 'range', rng, diagoutd, diagoutvd, newnc,       \
+          fill=gen.fillValueI)
+        ovar = newnc.variables['range']
+        ncvar.set_attribute(ovar, 'deriv', axis)
 
         ncvar.insert_variable(ncobj, 'orogmax', rngorogmax, diagoutd, diagoutvd,     \

trunk/tools/module_ForDiagnostics.f90

@@ -950 +950 @@
 
   SUBROUTINE compute_range_faces(d1, d2, lon, lat, hgt, dist, face, dsfilt, dsnewrange, hvalrng,      &
-    hgtmax, pthgtmax, derivhgt, peaks, valleys, origfaces, filtfaces, rangeshgtmax, ptrangeshgtmax)
+    hgtmax, pthgtmax, derivhgt, peaks, valleys, origfaces, filtfaces, ranges, rangeshgtmax,           &
+    ptrangeshgtmax)
 ! Subroutine to compute faces [uphill, valleys, downhill] of a mountain range along a given face
 
@@ -961 +962 @@
     REAL(r_k), DIMENSION(d1,d2), INTENT(out)             :: derivhgt, hgtmax, rangeshgtmax
     INTEGER, DIMENSION(d1,d2), INTENT(out)               :: pthgtmax, origfaces, filtfaces, peaks,    &
-      valleys, ptrangeshgtmax
+      valleys, ranges, ptrangeshgtmax
 ! Local
     INTEGER                                              :: i, j
@@ -988 +989 @@
 ! origfaces: original faces (-1, downhill; 0: valley; 1: uphill)
 ! filtfaces: filtered faces (-1, downhill; 0: valley; 1: uphill)
+! ranges: number of range
 ! rangeshgtmax: maximum height for each individual range [m]
 ! ptrangeshgtmax: grid point maximum height for each individual range [1]
@@ -1012 +1014 @@
         END DO
         DO i=1, Nranges
+          ranges(ranges1(1,i):ranges1(2,i),j) = i
           rangeshgtmax(ranges1(1,i):ranges1(2,i),j) = rangeshgtmax1(i)
           ptrangeshgtmax(irangeshgtmax1(i),j) = 1
@@ -1030 +1033 @@
         END DO
         DO j=1, Nranges
+          ranges(i,ranges2(1,j):ranges2(2,j)) = j
           rangeshgtmax(i,ranges2(1,j):ranges2(2,j)) = rangeshgtmax2(j)
           ptrangeshgtmax(i,irangeshgtmax2(j)) = 1

trunk/tools/module_ForDiagnosticsVars.f90

@@ -1650 +1650 @@
           faces0(i) = fillValI
         ELSE
-          faces0(i) = 1
+          faces0(i) = 2
         END IF
       ELSE IF (dhgt(i) < 0.) THEN
@@ -1656 +1656 @@
           faces0(i) = fillValI
         ELSE
-          faces0(i) = -1
+          faces0(i) = -2
         END IF
       ELSE
@@ -1773 +1773 @@
     !   face values before first range, removed: if dhgt[i] != 0. and i < range[1,1] --> face[i] = fillvalueI
     !   face values after last range, removed: if dhgt[i] != 0. and i < range[2,Nranges] --> face[i] = fillvalueI
+    !   Uphill valleys as 0.5: if face[i] == 0. and i < rangemax --> face[i] = 0.5
+    !   downhill valleys as 0.5: if face[i] == 0. and i > rangemax --> face[i] = -0.5
+    !   range peaks as 0. face[rangemax] = 0.
     DO i=1,Nranges
       DO j=ranges(1,i), ranges(2,i)
         IF (dhgt(j) > 0. .AND. j > irangeshgtmax(i)) faces0(j) = 0
         IF (dhgt(j) < 0. .AND. j < irangeshgtmax(i)) faces0(j) = 0
+        IF (faces0(j) == 0. .AND. j < irangeshgtmax(i)) faces0(j) = 1
+        IF (faces0(j) == 0. .AND. j > irangeshgtmax(i)) faces0(j) = -1
       END DO
+      faces0(irangeshgtmax(i)) = 0
     END DO
     IF (dhgt(j) /= 0. .AND. j < ranges(1,1)) faces0(j) = fillValI
     IF (dhgt(j) /= 0. .AND. j > ranges(2,Nranges)) faces0(j) = fillValI
+
+    ! Removing all that grid points outside any range
+    DO j=1, d
+      IF (j < ranges(1,1)) THEN
+        faces0(j) = fillValI
+      ELSE IF (j > ranges(2,Nranges)) THEN
+        faces0(j) = fillValI
+      ELSE
+        rangewithin = .FALSE.
+        DO i=1,Nranges
+          IF (j >= ranges(1,i) .AND. j <= ranges(2,i)) THEN
+            rangewithin = .TRUE.
+            EXIT
+          END IF
+        END DO
+        IF (.NOT.rangewithin) faces0(j) = fillValI
+      END IF
+    END DO
 
     ! classification using filt. 

trunk/tools/variables_values.dat

@@ -401 +401 @@
 r, r, rain_mixing_ratio, 0., 0.03, rain|mixing|ratio, KgKg-1, BuPu, $qr$, qr
 QRAIN, r, rain_mixing_ratio, 0., 0.03, rain|mixing|ratio, KgKg-1, BuPu, $qr$, qr
-rangefaces, rangefaces, range_faces, -1, 1, mountain|rage|faces|(-1:|downhill;|0:|valley|;1:|uphill), 1, seismic, $range^{faces}$,range_faces
-range_faces, rangefaces, range_faces, -1, 1, mountain|rage|faces|(-1:|downhill;|0:|valley|;1:|uphill), 1, seismic, $range^{faces}$,range_faces
+range, range, range, 0, 10, mountain|range, 1, Blues, $range$,range
+rangefaces, rangefaces, range_faces, -2, 2, mountain|range|faces|(-2:|downhill;-1:|downhill-valley;|0:|peak|;1:|uphill-valley;2:|uphill), 1, seismic, $range^{faces}$,range_faces
+range_faces, rangefaces, range_faces, -2, 2, mountain|range|faces|(-2:|downhill;-1:|downhill-valley;|0:|peak|;1:|uphill-valley;2:|uphill), 1, seismic, $range^{faces}$,range_faces
 reinf_slope, rslope, slope, 0., 1., slope, -, rainbow, $slope$, slope
 r_field, r_field, r_field, 0., 96., r_field, 1, BuPu, $r^{field}$, rfield